[libreoffice] 01/01: stop passing --disable-database-connectivity for no-Base archs (closes: #874274)

[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 4f822011bfd863eeec4fffcbbafa34fd601bd6f1
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Nov 4 00:50:36 2017 +0000

    stop passing --disable-database-connectivity for no-Base archs (closes: #874274)
---
 changelog | 4 +++-
 rules     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 1be532b..8ee6a1c 100644
--- a/changelog
+++ b/changelog
@@ -5,13 +5,15 @@ libreoffice (1:5.4.3~rc2-1) unstable; urgency=medium
   * debian/rules:
     - be consequent and enable the junit tests on armhf/arm64 now that
       those work.
+    - stop passing --disable-database-connectivity for no-Base archs
+      (closes: #874274)
   * debian/rules, debian/shlibs.override.mysql-connector-c++:
     temporarily force a lower dependency on libmysqlcppconn7v5, works
     also with 1.1.7 and we don't get blocked by mariadb-10.1...
   * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant)
     $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426)
 
- -- Rene Engelhard <rene at debian.org>  Sat, 04 Nov 2017 01:30:33 +0100
+ -- Rene Engelhard <rene at debian.org>  Sat, 04 Nov 2017 00:50:12 +0000
 
 libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 
diff --git a/rules b/rules
index e8cf380..d065d22 100755
--- a/rules
+++ b/rules
@@ -641,7 +641,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
 	DEBHELPER_OPTIONS += -Nlibreoffice-sdbc-postgresql -Nlibreoffice-mysql-connector
 	DEBHELPER_OPTIONS += -Nlibreoffice-sdbc-hsqldb -Nlibreoffice-sdbc-firebird 
 	DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
-	CONFIGURE_FLAGS += --disable-database-connectivity
+#	CONFIGURE_FLAGS += --disable-database-connectivity
   endif
 endif
 

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