[libreoffice] 02/03: fix internal firebird builds

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit ec4c11f274a881817569e57e1e45d3a2745768bc
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 9 21:22:39 2016 +0200

    fix internal firebird builds
---
 rules | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rules b/rules
index 761d6de..6b56181 100755
--- a/rules
+++ b/rules
@@ -1876,7 +1876,9 @@ ifeq "$(MYSQL_FLAVOUR)" "mysql"
 endif
 
 ifeq "$(ENABLE_FIREBIRD)" "y"
+  ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
 	perl -pi -e "s/(Build-Conflicts: .*)/\1,firebird-dev (>= 3.0),/" debian/control
+  endif
 endif
 
 ifeq (4.4,$(SYSTEM_GCC_VERSION))
@@ -2853,6 +2855,10 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
 	mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/program
 	mv $(PKGDIR)-base/$(OODIR)/program/libfirebird_sdbclo.so \
 		$(PKGDIR)-sdbc-firebird/$(OODIR)/program
+  ifeq (,$(filter firebird, $(SYSTEM_STUFF)))
+	mv $(PKGDIR)-core/$(OODIR)/program/libfbembed.so.2.5 \
+		$(PKGDIR)-sdbc-firebird/$(OODIR)/program
+  endif
 endif
 	mkdir -p $(PKGDIR)-base-drivers/$(OODIR)/program
 	for i in `find $(PKGDIR)-base/$(OODIR)/program/ -name "*.so" \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git