[libreoffice] 02/03: 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 master
in repository libreoffice.

commit 7b1e5abb209c945befb06735edcbbfcbebfe15a9
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Nov 13 17:44:38 2017 +0100

    Revert "temporarily force a lower dependency on libmysqlcppconn7v5"
    
    mariadb-10.1 is (supposed to be) fixed
    
    This reverts commit e322dcb005a5c7de585d5f543342f1f1cab08e58.
    
    Conflicts:
    	changelog
    	rules
---
 changelog                           | 3 ---
 rules                               | 5 -----
 shlibs.override.mysql-connector-c++ | 1 -
 3 files changed, 9 deletions(-)

diff --git a/changelog b/changelog
index ca00b6f..75704a7 100644
--- a/changelog
+++ b/changelog
@@ -29,9 +29,6 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
     - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
     - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
       Java9 in reportbuilder) 
-  * 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)
   * debian/rules, debian/libreoffice-common.maintscript: fix path in/for
diff --git a/rules b/rules
index 49ba427..8ffc030 100755
--- a/rules
+++ b/rules
@@ -3403,11 +3403,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-cppconn, $(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