[libreoffice] 01/01: bump libcmis dependency to (>= 0.5.1+git20160603) to assure the advertised google 2-factor-auth stuff is present
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 9f4c5a916387a4f454333cc2f5fe694079ab7400
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 6 08:58:30 2016 +0200
bump libcmis dependency to (>= 0.5.1+git20160603) to assure the advertised google 2-factor-auth stuff is present
---
changelog | 5 ++++-
rules | 6 ++++++
shlibs.override.libcmis | 3 +++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index fae4f5f..cb25fd1 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,11 @@ libreoffice (1:5.2.0-2) UNRELEASED; urgency=medium
* debian/control.nlpsolver.in: fix override disparity , use old values
(math/extra)
+ * debian/rules, debian/shlibs.override.libcmis: bump libcmis dependency
+ to (>= 0.5.1+git20160603) to assure the advertised google 2-factor-auth
+ stuff is present
- -- Rene Engelhard <rene@debian.org> Fri, 05 Aug 2016 13:09:08 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 06 Aug 2016 08:58:18 +0200
libreoffice (1:5.2.0-1) unstable; urgency=medium
diff --git a/rules b/rules
index 1827366..a6788cc 100755
--- a/rules
+++ b/rules
@@ -3300,6 +3300,7 @@ endif
ifeq "$(BUILD_KFREEBSD)" "y"
cat debian/shlibs.override.libc >> debian/shlibs.local
endif
+ # no shlibs dependencies on internal libs (which are dynamic)
ifeq (,$(filter icu, $(SYSTEM_STUFF)))
cat debian/shlibs.override.icu >> debian/shlibs.local
endif
@@ -3336,6 +3337,11 @@ endif
ifeq (,$(filter liblangtag, $(SYSTEM_STUFF)))
cat debian/shlibs.override.liblangtag >> 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)))
+ cat debian/shlibs.override.libcmis >> debian/shlibs.local
+endif
# we need to do it in two steps. The new dpkg-shlibdeps doesn't find
# /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
diff --git a/shlibs.override.libcmis b/shlibs.override.libcmis
new file mode 100644
index 0000000..504557b
--- /dev/null
+++ b/shlibs.override.libcmis
@@ -0,0 +1,3 @@
+libcmis-0.5 5 libcmis-0.5-5v5 (>= 0.5.1+git20160603)
+libcmis-c-0.5 5 libcmis-0.5-5v5 (>= 0.5.1+git20160603)
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: