[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0_rc2-2-24-gf4535d9
The following commit has been merged in the debian-experimental-4.2 branch:
commit f4535d93922c5aced9654ff7aec52efae1b51bb6
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jul 23 01:02:41 2013 +0200
build-depend on fixed firebird-dev
diff --git a/control b/control
index f14bf9e..71dc0bb 100644
--- a/control
+++ b/control
@@ -15,7 +15,7 @@ Build-Depends: ant (>= 1.7.0),
debhelper (>= 7.2.3~),
dpkg-dev (>= 1.16.1),
fastjar,
- firebird-dev,
+ firebird-dev (>= 2.5.2.26540.ds4-2),
flex | flex-old,
fonts-liberation,
g++-mingw-w64-i686 [i386 amd64],
@@ -43,7 +43,6 @@ Build-Depends: ant (>= 1.7.0),
libebook1.2-dev,
libexpat1-dev,
libexttextcat-dev (>= 3.1.1),
- libfbembed2.5,
libfontconfig1-dev,
libfreetype6-dev,
libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386],
@@ -4448,7 +4447,7 @@ Depends: ant (>= 1.7.0),
doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
fastjar,
- firebird-dev,
+ firebird-dev (>= 2.5.2.26540.ds4-2),
flex | flex-old,
fontforge,
fonts-liberation,
@@ -4480,7 +4479,6 @@ Depends: ant (>= 1.7.0),
libebook1.2-dev,
libexpat1-dev,
libexttextcat-dev (>= 3.1.1),
- libfbembed2.5,
libflute-java (>= 1.1.6),
libfontconfig1-dev,
libfonts-java (>= 1.1.6),
diff --git a/patches/firebird-manual-variables.diff b/patches/firebird-manual-variables.diff
deleted file mode 100644
index ca257e1..0000000
--- a/patches/firebird-manual-variables.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 4ee8955..7ce4b94 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8096,20 +8126,10 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
- if test "$with_system_firebird" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_FIREBIRD=YES
-- AC_PATH_PROG(FIREBIRDCONFIG, [fb_config])
-- if test -z "$FIREBIRDCONFIG"; then
-- AC_MSG_NOTICE([No fb_config -- using pkg-config])
-- FIREBIRD_VERSION=`pkg-config --modversion fbembed`
-- AC_MSG_CHECKING([for Firebird Client library])
-- FIREBIRD_CFLAGS=`pkg-config --cflags fbembed`
-- FIREBIRD_LIBS=`pkg-config --libs fbembed`
-- else
-- AC_MSG_NOTICE([fb_config found])
-- FIREBIRD_VERSION=`$FIREBIRDCONFIG --version`
-- AC_MSG_CHECKING([for Firebird Client library])
-- FIREBIRD_CFLAGS=`$FIREBIRDCONFIG --cflags`
-- FIREBIRD_LIBS=`$FIREBIRDCONFIG --embedlibs`
-- fi
-+ AC_MSG_CHECKING([for Firebird Client library])
-+ FIREBIRD_CFLAGS=
-+ FIREBIRD_LIBS="-L/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` -lfbembed"
-+ FIREBIRD_VERSION=`dpkg -l firebird-dev | grep ^ii | awk '{ print $3 }' | cut -d. -f1,2,3`
- AC_MSG_CHECKING([Firebird version])
- FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1`
- FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2`
diff --git a/patches/series b/patches/series
index cc31a14..0532a05 100644
--- a/patches/series
+++ b/patches/series
@@ -29,4 +29,3 @@ javadoc-optional.diff
show-the-startcenter.diff
hack-interlck_sparc.diff
opencl-multiarch.diff
-firebird-manual-variables.diff
diff --git a/rules b/rules
index 6b205d3..fc8ca52 100755
--- a/rules
+++ b/rules
@@ -1120,9 +1120,7 @@ ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF)))
BUILD_DEPS += , libatomic-ops-dev (>= 7.3~alpha1+git20110913-1)
endif
ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
- BUILD_DEPS += , firebird-dev
- # firebird-dev only Suggests libfbembed2.5...
- BUILD_DEPS += , libfbembed2.5
+ BUILD_DEPS += , firebird-dev (>= 2.5.2.26540.ds4-2)
endif
ifeq "$(BUILD_GTK)" "n"
--
LibreOffice packaging repository
Reply to: