[libreoffice] 01/01: Revert "temporarily force a lower dependency on libmysqlcppconn7v5".

[Rene Engelhard]

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

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

commit 5d75c05fb5e2b549cade00dd5313a88603f00edd
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 6 23:59:19 2017 +0000

    Revert "temporarily force a lower dependency on libmysqlcppconn7v5".
    
    Only for 5.4.x. By 6.0.0 this is hopefully sorted out...
    
    This reverts commit e322dcb005a5c7de585d5f543342f1f1cab08e58.
---
 changelog                           | 3 ---
 rules                               | 5 -----
 shlibs.override.mysql-connector-c++ | 1 -
 3 files changed, 9 deletions(-)

diff --git a/changelog b/changelog
index a06b979..a512403 100644
--- a/changelog
+++ b/changelog
@@ -10,9 +10,6 @@ libreoffice (1:6.0.0~beta1~git20171106-1) UNRELEASED; urgency=medium
       file and is recommended anyway because of the gdb helpers.
     - be consequent and enable the junit tests on armhf/arm64 now that
       those work.
-  * 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)
 
diff --git a/rules b/rules
index d385782..a2f2051 100755
--- a/rules
+++ b/rules
@@ -3375,11 +3375,6 @@ ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
 	# instead of .symbols which gives os only a (>= 2.5.0.25784~ReleaseCandidate1.ds2)...
 	cat /var/lib/dpkg/info/libfbclient2*.shlibs >> debian/shlibs.local
 endif
-ifneq (,$(filter mysql-connector-c++, $(SYSTEM_STUFF)))
-	# temporarily force a lower dependency to not be blocked behind
-        # mysql-connector-c++ which is blocked behind mariadb-10.1 :/
-	cat debian/shlibs.override.mysql-connector-c++ >> debian/shlibs.local
-endif
 
 	LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OODIR)/program:debian/ure/$(OODIR)/program:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(PKGDIR)-writer/$(OODIR)/program" \
 		dh_shlibdeps -a \
diff --git a/shlibs.override.mysql-connector-c++ b/shlibs.override.mysql-connector-c++
deleted file mode 100644
index 9e70463..0000000
--- a/shlibs.override.mysql-connector-c++
+++ /dev/null
@@ -1 +0,0 @@
-libmysqlcppconn 7 libmysqlcppconn7v5 (>= 1.1.7)

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