[libreoffice] 01/01: blind fix for internal firebird 3.0 install

Rene Engelhard rene at moszumanska.debian.org
Sun Oct 9 20:56:35 UTC 2016


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 389fa98a8e4994df68f73019935fe551cd9598a7
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 9 22:56:22 2016 +0200

    blind fix for internal firebird 3.0 install
---
 rules | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/rules b/rules
index c7a779d..ad23072 100755
--- a/rules
+++ b/rules
@@ -2698,9 +2698,16 @@ 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
+  ifeq (,$(filter firebird, $(SYSTEM_STUFF))
+	for i in libEngine12.so libfbclient.so.2; do \
+		mv $(PKGDIR)-core/$(OODIR)/program/$$i \
+			$(PKGDIR)-sdbc-firebird/$(OODIR)/program; \
+	done
+	mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/share/firebird
+	for i in firebird.msg security3.fdb; do \
+		mv $(PKGDIR)-core/$(OODIR)/share/$$i \
+			 $(PKGDIR)-sdbc-firebird/$(OODIR)/share/firebird; \
+	done	 
   endif
 endif
 	mkdir -p $(PKGDIR)-base-drivers/$(OODIR)/program

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



More information about the Pkg-openoffice-commits mailing list