[libreoffice] 01/01: use fb_config and add firebird3.0-server (build-)depends for firebird3
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 2d5350f8709101c358c23367674d45d8cdf2cb5a
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jun 6 21:54:58 2016 +0200
use fb_config and add firebird3.0-server (build-)depends for firebird3
---
control | 5 ++++-
control.in | 2 +-
rules | 12 ++++++++----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/control b/control
index 6bef32a..f35d66b 100644
--- a/control
+++ b/control
@@ -883,7 +883,10 @@ Description: VLC backend for LibreOffice
Package: libreoffice-sdbc-firebird
Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
+Depends: libreoffice-core,
+ ${firebird-server-depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
Architecture: alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el
Section: database
Enhances: libreoffice-base-drivers
diff --git a/control.in b/control.in
index e6f0999..212b243 100644
--- a/control.in
+++ b/control.in
@@ -713,7 +713,7 @@ Description: VLC backend for LibreOffice
Package: libreoffice-sdbc-firebird
Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-core, ${shlibs:Depends}, ${misc:Depends}
+Depends: libreoffice-core, ${shlibs:Depends}, ${misc:Depends}, ${firebird-server-depends}
Architecture: %OOO_LE_ARCHS%
Section: database
Enhances: libreoffice-base-drivers
diff --git a/rules b/rules
index 99e9a00..f4a4a1e 100755
--- a/rules
+++ b/rules
@@ -1313,12 +1313,15 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
endif
ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
BUILD_DEPS += , firebird-dev (>= 2.5.2.26540.ds4-2)$(OOO_NO_LE_ARCHS)
- # hack for firebird 3. configure expects fb_config or pkg-config, neither of
- # which firebird 3 provides. WTF? (See http://bugs.debian.org/826320)
- ifeq "$(shell dpkg --compare-versions `dpkg -l firebird-dev | grep ^ii | awk '{ print $$3 }'` ge 3 && echo true)" "true"
-export FIREBIRD_VERSION=3.0.0
+ # override the firebird-related variables for firebird 3 as
+ # fb_config --embedlibs gives -lfbembed which is gone..
+ ifeq "$(shell dpkg --compare-versions `fb_config --version` ge 3 && echo true)" "true"
+export FIREBIRD_VERSION=$(shell fb_config --version)
export FIREBIRD_LIBS=-lfbclient
export FIREBIRD_CFLAGS="-I/usr/include/firebird"
+ # we need libEngine12.so
+ BUILD_DEPS += , firebird$(shell echo $(FIREBIRD_VERSION) | cut -d. -f1,2)-server
+ FIREBIRD_SERVER_DEPENDS += firebird$(shell echo $(FIREBIRD_VERSION) | cut -d. -f1,2)-server
endif
endif
else
@@ -3398,6 +3401,7 @@ endif
-V'gnome-gtk-recommends=$(GNOME_GTK_RECOMMENDS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-V'python-six-recommends=$(PYTHON_SIX_RECOMMENDS)' \
+ -V'firebird-server-depends=$(FIREBIRD_SERVER_DEPENDS)' \
-v$(BINARY_VERSION)
ifeq "$(ENABLE_JAVA)" "y"
perl -pi -e "s/java-gcj-compat/java-gcj-compat (>= 1.0.77-4)/" \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: