[libreoffice] 05/05: Don't recommend libreoffice-sdbc-firebird if firebird is disabled

[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 9f417f7569c60f341a6ee55e7219314646e52027
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Fri Jul 21 21:32:41 2017 +0200

    Don't recommend libreoffice-sdbc-firebird if firebird is disabled
---
 control    | 4 ++--
 control.in | 2 +-
 rules      | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/control b/control
index d1a83bf..3a673f4 100644
--- a/control
+++ b/control
@@ -844,8 +844,8 @@ Suggests: libjtds-java,
           libreoffice-mysql-connector | libmyodbc | libmysql-java,
           libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
           libsqliteodbc | tdsodbc | mdbtools
-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]
+Recommends: libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386],
+            ${base-firebird-recommends}
 Replaces: libreoffice-base (<< 1:4.3.0-3)
 Breaks: libreoffice-base (<< 1:4.3.0-3)
 Description: Database connectivity drivers for LibreOffice
diff --git a/control.in b/control.in
index 8695cc1..a8588c5 100644
--- a/control.in
+++ b/control.in
@@ -660,7 +660,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 [%OOO_FIREBIRD_ARCHS%]
+Recommends: libreoffice-sdbc-hsqldb [%OOO_JAVA_ARCHS%], ${base-firebird-recommends}
 Replaces: 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 3da4165..57b3e24 100755
--- a/rules
+++ b/rules
@@ -1324,6 +1324,7 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
 endif
 
 ifeq "$(ENABLE_FIREBIRD)" "y"
+	BASE_FIREBIRD_RECOMMENDS = libreoffice-sdbc-firebird [$(OOO_FIREBIRD_ARCHS)]
   ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libatomic-ops-dev (>= 7.3~alpha1+git20110913-1)$(OOO_NO_BE_ARCHS)
   endif
@@ -1338,6 +1339,7 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
   endif
 else
 	CONFIGURE_FLAGS += --disable-firebird-sdbc
+	DEBHELPER_OPTIONS += -Nlibreoffice-sdbc-firebird
 endif
 
 ifeq "$(BUILD_GTK)" "n"
@@ -3416,6 +3418,7 @@ endif
 		-V'next-oover=$(NEXT_OOVER)' \
 		-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
 		-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
+		-V'base-firebird-recommends=$(BASE_FIREBIRD_RECOMMENDS)' \
 		-V'java-common-depends=$(JAVA_COMMON_DEPENDS) $(JAVA_COMMON_DEPENDS_VERSION)' \
 		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
 		-V'Binary-Version=$(BINARY_VERSION)' \

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