[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0_rc2-2-18-g38fc75b
The following commit has been merged in the debian-experimental-4.2 branch:
commit 38fc75b349af6c603f6218a73dd4c656a65823d3
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jul 16 23:35:07 2013 +0200
we need a explicit libfbembed2.5 build-dep as firebird-dev only suggests it...
diff --git a/control b/control
index d615ef7..f14bf9e 100644
--- a/control
+++ b/control
@@ -43,6 +43,7 @@ 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],
@@ -4479,6 +4480,7 @@ 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/rules b/rules
index 98ef714..76844b4 100755
--- a/rules
+++ b/rules
@@ -1121,6 +1121,8 @@ ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF)))
endif
ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
BUILD_DEPS += , firebird-dev
+ # firebird-dev only Suggests libfbembed2.5...
+ BUILD_DEPS += , libfbembed2.5
endif
ifeq "$(BUILD_GTK)" "n"
--
LibreOffice packaging repository
Reply to: