[libreoffice] 03/03: if enabling mysql connector, use default (aka mariadb) as MYSQL_FLAVOUR and internal mysqlcppconn

[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 8c54cd99eea6eab983b4a89d6333364ecc2f5f20
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Oct 17 19:17:25 2016 +0200

    if enabling mysql connector, use default (aka mariadb) as MYSQL_FLAVOUR and internal mysqlcppconn
---
 changelog | 2 ++
 control   | 1 -
 rules     | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index d1f3165..3b6390e 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:5.2.3~rc1-2) unstable; urgency=medium
   * debian/rules:
     - disable mysql connector given mysql-* will be removed for stretch and
       mysql-connector-c++ should probably stay mysql for mysql-workbench
+    - if enabling mysql connector, use default (mariadb) as flavour and internal
+      mysqlcppconn
 
  -- Rene Engelhard <rene at debian.org>  Mon, 17 Oct 2016 19:10:29 +0200
 
diff --git a/control b/control
index 922ed5b..1048f99 100644
--- a/control
+++ b/control
@@ -177,7 +177,6 @@ Build-Conflicts: amd-libopencl1,
                  libc6-dev (= 2.6.1-3) [i386 amd64],
                  libc6-dev (= 2.6.1-4) [i386 amd64],
                  libcairo2 (= 1.4.8-1),
-                 libmariadbclient-dev,
                  libxul-dev (= 1.8.0.13~pre070720-0etch1),
                  nvidia-glx-dev,
                  nvidia-glx-legacy-dev,
diff --git a/rules b/rules
index 91417ec..527b5d6 100755
--- a/rules
+++ b/rules
@@ -417,10 +417,10 @@ endif
 DEFAULT_IMAGE=galaxy
 IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze
 ENABLE_MYSQLNATIVE=n
-MYSQL_FLAVOUR=mysql
+MYSQL_FLAVOUR=default
 # set this also to y for system-mysql..
 SYSTEM_STUFF += mariadb
-SYSTEM_STUFF += mysql-cppconn
+#SYSTEM_STUFF += mysql-cppconn
 ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
 MYSQLCPPCONN_MINVER= (>= 1.1.3-7)
 else

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