[libreoffice] 01/02: recommend -sdbc-firebird only where it's built (LE) to prepare for it being a dependency when firebird will be the default embedded engine

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 77c01c1b10d4e9dc1911f151dd1bcb19af6fc5fb
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Feb 17 10:41:06 2017 +0100

    recommend -sdbc-firebird only where it's built (LE) to prepare for it being a dependency when firebird will be the default embedded engine
---
 changelog  | 3 +++
 control    | 2 +-
 control.in | 2 +-
 rules      | 8 ++++++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 08012b8..a7307ad 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,9 @@ libreoffice (1:5.4.0~alpha0~git20170213-1) UNRELEASED; urgency=medium
     remove extra libreoffice-pdfimport, merge (even though the poppler
     dependecy...) back to -common/-core since it has the above new feature and
     otherwise it may get confusing what is what.
+  * debian/rules, debian/control.in: recommend -sdbc-firebird only where it's
+    built (LE) to prepare for it being a dependency when firebird will be the
+    default embedded engine
 
   * tarballs/9ac66c71463f9440e3ccc996c5e66556-pdfium-3004.tar.bz2,
     debian/copyright, debian/source/include-binaries: include pdfium
diff --git a/control b/control
index 573bd7d..3df6478 100644
--- a/control
+++ b/control
@@ -895,7 +895,7 @@ Suggests: libjtds-java,
           libreoffice-mysql-connector | libmyodbc | libmysql-java,
           libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
           libsqliteodbc | tdsodbc | mdbtools
-Recommends: libreoffice-sdbc-firebird,
+Recommends: libreoffice-sdbc-firebird [alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el],
             libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386]
 Replaces: libreoffice-base (<< 1:4.3.0-3), libreoffice-core (<< 1:4.2~)
 Breaks: libreoffice-base (<< 1:4.3.0-3)
diff --git a/control.in b/control.in
index 612c99a..ffee8fc 100644
--- a/control.in
+++ b/control.in
@@ -717,7 +717,7 @@ Suggests: libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
           libreoffice-mysql-connector | libmyodbc | libmysql-java,
           libsqliteodbc | tdsodbc | mdbtools,
           libjtds-java,
-Recommends: libreoffice-sdbc-hsqldb [%OOO_JAVA_ARCHS%], libreoffice-sdbc-firebird
+Recommends: libreoffice-sdbc-hsqldb [%OOO_JAVA_ARCHS%], libreoffice-sdbc-firebird [%OOO_FIREBIRD_ARCHS%]
 Replaces: libreoffice-core (<< 1:4.2~), libreoffice-base (<< 1:4.3.0-3)
 Breaks: libreoffice-base (<< 1:4.3.0-3)
 Description: Database connectivity drivers for LibreOffice
diff --git a/rules b/rules
index c38774f..efb59e5 100755
--- a/rules
+++ b/rules
@@ -602,6 +602,8 @@ OOO_BASE_ARCHS := $(OOO_JAVA_ARCHS)
 $(eval $(call gen_no_archs,OOO_BASE_ARCHS))
 OOO_REPORTDESIGN_ARCHS := $(OOO_BASE_ARCHS)
 $(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
+OOO_FIREBIRD_ARCHS := $(OOO_LE_ARCHS)
+$(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS))
 
 OOO_CHECK_ARCHS := $(filter-out kfreebsd-i386 kfreebsd-amd64 sparc64,$(OOO_ARCHS))
 $(eval $(call gen_no_archs,OOO_CHECK_ARCHS))
@@ -1300,9 +1302,9 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
 	BUILD_DEPS += , libtommath-dev$(OOO_NO_BE_ARCHS)
   endif
   ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , firebird-dev (>= 3.0.0.32483.ds4-4)$(OOO_NO_LE_ARCHS)
+	BUILD_DEPS += , firebird-dev (>= 3.0.0.32483.ds4-4)$(OOO_NO_FIREBIRD_ARCHS)
 	# we need libEngine12.so
-	BUILD_DEPS += , firebird3.0-server-core $(OOO_NO_LE_ARCHS) <!nocheck>
+	BUILD_DEPS += , firebird3.0-server-core $(OOO_NO_FIREBIRD_ARCHS) <!nocheck>
 	FIREBIRD_ENGINE_DEPENDS += firebird3.0-server-core
   endif
 else
@@ -1812,6 +1814,8 @@ endif
 	perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
+	perl -pi -e "s,%OOO_FIREBIRD_ARCHS%,$(OOO_FIREBIRD_ARCHS),g" debian/control
+	perl -pi -e "s,%OOO_NO_FIREBIRD_ARCHS%,$(OOO_NO_FIREBIRD_ARCHS),g" debian/control
 	perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
 	perl -pi -e "s#%JUNIT_MIN_VER%#$(JUNIT_MIN_VER)#g" debian/control
 ifeq "$(BUILD_KDE)" "y"

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