[libreoffice] 01/02: re-enable mysql-connector

[Rene Engelhard]

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

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

commit d7c857ab44c8a4bbb8a0981afee911c8487f6784
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 15 06:39:14 2016 +0100

    re-enable mysql-connector
    
    Conflicts:
    	changelog
    	control
    	rules
    	tests/control
---
 changelog                    |  4 ++++
 control                      | 17 +++++++++++++++++
 rules                        |  9 ++++++---
 shlibs.override.mysqlcppconn |  1 +
 tests/control                |  2 +-
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index c4b136e..963ff77 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,10 @@ libreoffice (1:5.2.4~rc1~git20161025-1) UNRELEASED; urgency=medium
 
   * debian/patches/no-openssl.diff: don't uselessly check for openssl and
     don't require openssl in postgresql-sdbc-impl, not (directly) used
+  * dbeian/rules:
+    - enable mysql-connector again now that libmysqlcppconn _and_
+      mysql-workbench are built against mariadb.
+      Bump (Build-)Dependency on libmysqlcppconn to >= 1.1.7-3 to go sure
 
  -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
 
diff --git a/control b/control
index 37f079d..2204aab 100644
--- a/control
+++ b/control
@@ -19,6 +19,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
                default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
                default-jdk (>= 2:1.8-55) [sparc64],
                default-jdk [!mips64],
+               default-libmysqlclient-dev,
                dh-python,
                dpkg-dev (>= 1.18.2~),
                fastjar,
@@ -4562,6 +4563,22 @@ Description: PostgreSQL SDBC driver for LibreOffice
  LibreOffice without any wrapper layer such as ODBC or JDBC.
 Homepage: http://wiki.documentfoundation.org/PostgreSQL-SDBC
 
+Package: libreoffice-mysql-connector
+Section: misc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
+Suggests: default-mysql-server | virtual-mysql-server
+Conflicts: libreoffice-common (<< 1:3.5~),
+           libreoffice-core (<< 1:3.5~),
+           ure (<< 1.5.1+OOo3.1.1-15)
+Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
+Description: MariaDB/MySQL Connector extension for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The MariaDB/MySQL Connector extension allows one to use the MariaDB or MySQL
+ database from LibreOffice without any wrapper layer such as ODBC or JDBC.
+
 Package: libreoffice-evolution
 Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
 Section: gnome
diff --git a/rules b/rules
index 26f8f73..234c774 100755
--- a/rules
+++ b/rules
@@ -415,13 +415,13 @@ CPPUNIT_MINVER=0.12
 endif
 DEFAULT_IMAGE=galaxy
 IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze
-ENABLE_MYSQLNATIVE=n
+ENABLE_MYSQLNATIVE=y
 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)
+MYSQLCPPCONN_MINVER= (>= 1.1.7-3)
 else
 MYSQLCPPCONN_MINVER= (>= 1.1.0~r791)
 endif
@@ -3364,6 +3364,9 @@ endif
 ifeq (,$(filter liblangtag, $(SYSTEM_STUFF)))
 	cat debian/shlibs.override.liblangtag >> debian/shlibs.local
 endif
+ifeq (,$(filter mysqlcppconn, $(SYSTEM_STUFF)))
+	cat debian/shlibs.override.mysqlcppconn >> debian/shlibs.local
+endif
 	# the other way as the above, depend on a newer libcmis to that the
 	# advertised google 2-factor-auth fixes are present
 ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
diff --git a/shlibs.override.mysqlcppconn b/shlibs.override.mysqlcppconn
new file mode 100644
index 0000000..f696575
--- /dev/null
+++ b/shlibs.override.mysqlcppconn
@@ -0,0 +1 @@
+libmysqlcppconn 7 libmysqlcppconn7v5 (>= 1.1.7-3)
diff --git a/tests/control b/tests/control
index 2c5b0cc..4b650c1 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
 Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
 
 Tests: pyuno-import
 Depends: python3-uno

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