[libreoffice] 152/152: Dont have Recommends: on firebird when building w/o firebird

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit fa127e9757ad348b71f598b36fd312cd7ed67143
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Feb 14 03:50:22 2017 +0100

    Dont have Recommends: on firebird when building w/o firebird
---
 changelog  | 3 ++-
 control.in | 2 +-
 rules      | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 19d66e4..ce08143 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
 libreoffice (1:5.3.0~rc3-0ubuntu2) zesty; urgency=medium
 
   * (re-)add ant and ant-optional dependency for autopkgtests
+  * Dont have Recommends: on firebird when building w/o firebird
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 14 Feb 2017 03:25:00 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 14 Feb 2017 03:48:41 +0100
 
 libreoffice (1:5.3.0~rc3-0ubuntu1) zesty; urgency=medium
 
diff --git a/control.in b/control.in
index 851e8d1..8070a0b 100644
--- a/control.in
+++ b/control.in
@@ -756,7 +756,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%], @DB_FIREBIRD_DEPS@
 Replaces: libreoffice-core (<< 1:4.2~), libreoffice-base (<< 1:4.3.0-3ubuntu2~)
 Breaks: libreoffice-base (<< 1:4.3.0-3ubuntu2~)
 Description: Database connectivity drivers for LibreOffice
diff --git a/rules b/rules
index 0ab73f8..bd733c6 100755
--- a/rules
+++ b/rules
@@ -764,6 +764,9 @@ endif
 CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
 ifneq ($(ENABLE_FIREBIRD),y)
   CONFIGURE_FLAGS += --disable-firebird-sdbc
+  DB_FIREBIRD_DEPS :=
+else
+  DB_FIREBIRD_DEPS := , libreoffice-sdbc-firebird
 endif
 
 CC_PREFIX:=$(shell gcc -dumpmachine)-
@@ -1656,6 +1659,7 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
 	    -e "s#%[A-Za-z]*=[^%]*%##g#" \
 	    -e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
 	    -e "s#@BUGS@#$(BUGS)#g" \
+	    -e "s#@DB_FIREBIRD_DEPS@#$(strip $(DB_FIREBIRD_DEPS))#g" \
 	    < debian/control.in > debian/control
 
 	cat debian/control.transitionals.in >> debian/control

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