[libreoffice] 05/11: let .shlibs do its job and bump build-dep for libmysqlcppconn-dev; 1.1.7-1/2 were only in experimental...

[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 c89110b24c7b341a674de09f8ebf38833374cdf3
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 15 22:02:04 2016 +0100

    let .shlibs do its job and bump build-dep for libmysqlcppconn-dev; 1.1.7-1/2 were only in experimental...
---
 control                      | 2 +-
 rules                        | 5 +----
 shlibs.override.mysqlcppconn | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/control b/control
index 3f664c8..9e533ab 100644
--- a/control
+++ b/control
@@ -95,7 +95,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
                libmdds-dev (>= 1.2),
                libmspub-dev (>= 0.1),
                libmwaw-dev (>= 0.3.1),
-               libmysqlcppconn-dev (>= 1.1.7-3),
+               libmysqlcppconn-dev (>= 1.1.7-4),
                libmythes-dev (>= 2:1.2),
                libneon27-gnutls-dev,
                libnss3-dev (>= 3.12.3),
diff --git a/rules b/rules
index ae0da5a..db61be8 100755
--- a/rules
+++ b/rules
@@ -421,7 +421,7 @@ MYSQL_FLAVOUR=default
 SYSTEM_STUFF += mariadb
 SYSTEM_STUFF += mysql-cppconn
 ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
-MYSQLCPPCONN_MINVER= (>= 1.1.7-3)
+MYSQLCPPCONN_MINVER= (>= 1.1.7-4)
 else
 MYSQLCPPCONN_MINVER= (>= 1.1.0~r791)
 endif
@@ -3364,9 +3364,6 @@ 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
deleted file mode 100644
index f696575..0000000
--- a/shlibs.override.mysqlcppconn
+++ /dev/null
@@ -1 +0,0 @@
-libmysqlcppconn 7 libmysqlcppconn7v5 (>= 1.1.7-3)

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