[libreoffice] 02/03: disable mysql connector

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

    disable mysql connector
---
 changelog     |  8 ++++++++
 control       | 18 ------------------
 rules         |  2 +-
 tests/control |  2 +-
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/changelog b/changelog
index ab42237..d1f3165 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+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
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 17 Oct 2016 19:10:29 +0200
+
 libreoffice (1:5.2.3~rc1-1) unstable; urgency=medium
 
   * New upstream release candidate
diff --git a/control b/control
index 7e7d61c..922ed5b 100644
--- a/control
+++ b/control
@@ -94,8 +94,6 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
                libmdds-dev (>= 1.2),
                libmspub-dev (>= 0.1),
                libmwaw-dev (>= 0.3.1),
-               libmysqlclient-dev,
-               libmysqlcppconn-dev (>= 1.1.3-7),
                libmythes-dev (>= 2:1.2),
                libneon27-gnutls-dev,
                libnss3-dev (>= 3.12.3),
@@ -4567,22 +4565,6 @@ 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 hppa ia64 s390 sparc
-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 adcb723..91417ec 100755
--- a/rules
+++ b/rules
@@ -416,7 +416,7 @@ CPPUNIT_MINVER=0.12
 endif
 DEFAULT_IMAGE=galaxy
 IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze
-ENABLE_MYSQLNATIVE=y
+ENABLE_MYSQLNATIVE=n
 MYSQL_FLAVOUR=mysql
 # set this also to y for system-mysql..
 SYSTEM_STUFF += mariadb
diff --git a/tests/control b/tests/control
index 9ce3278..f9f2ce7 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