[libreoffice] 02/02: 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 e322dcb005a5c7de585d5f543342f1f1cab08e58
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Oct 27 15:25:51 2017 +0200

    temporarily force a lower dependency on libmysqlcppconn7v5
---
 changelog                           | 5 ++++-
 rules                               | 5 +++++
 shlibs.override.mysql-connector-c++ | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 74c12f5..20fe27a 100644
--- a/changelog
+++ b/changelog
@@ -3,7 +3,10 @@ libreoffice (1:5.4.3~rc1-3) UNRELEASED; urgency=medium
   * debian/rules:
     - 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...
+    
  -- Rene Engelhard <rene at debian.org>  Thu, 26 Oct 2017 17:23:53 +0200
 
 libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
diff --git a/rules b/rules
index 629f859..ff94b2c 100755
--- a/rules
+++ b/rules
@@ -3398,6 +3398,11 @@ 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++
new file mode 100644
index 0000000..9e70463
--- /dev/null
+++ b/shlibs.override.mysql-connector-c++
@@ -0,0 +1 @@
+libmysqlcppconn 7 libmysqlcppconn7v5 (>= 1.1.7)

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