[libreoffice] 02/05: Merge branch 'master' into debian-experimental-5.2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 3bee56ae6bec24d7ddc8e73d4a0e843cc1ae3b7a
Merge: 6076763 92626e6
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 10 13:04:00 2016 +0200
Merge branch 'master' into debian-experimental-5.2
Conflicts:
changelog
changelog | 21 +++++++++++++++++
control | 38 ++++++++++++++++++++++++------
control.gtk2.in | 21 +++++++++++++++++
control.in | 28 ++++------------------
control.nlpsolver.in | 2 ++
control.systray.in | 11 +++++++++
patches/make-package-modules-not-suck.diff | 32 +++++++++++++++----------
rules | 19 ++++++++++++---
shlibs.override.libcmis | 3 +++
9 files changed, 128 insertions(+), 47 deletions(-)
diff --cc changelog
index 5abef53,15212b6..a735b5f
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,24 +1,30 @@@
+libreoffice (1:5.2.1~rc1~git20160730-1) UNRELEASED; urgency=medium
+
+ * new upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Sat, 30 Jul 2016 15:31:55 +0200
+
+ libreoffice (1:5.2.0-2) UNRELEASED; urgency=medium
+
+ * debian/patches/make-package-modules-not-suck.diff: move animcore into
+ DRAW (closes: #833181)
+
+ * 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
+ * debian/control.in:
+ - update libroffice-gtk mentioning in libreoffice's
+ description to say gtk(2|3) (closes: #833694) - thanks Vincent Levebre
+ - remove mention of Quickstarter from libreoffice and libreoffice-gtk2
+ descriptions; gone there since some time
+ - add Replaces:/Breaks: for libanimcorelo.so move
+ * debian/control.systray.in, debian/rules: install the systray stuff into a
+ new -systray package (if enabled)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 10 Aug 2016 10:02:27 +0200
+
libreoffice (1:5.2.0-1) unstable; urgency=medium
* LibreOffice 5.2.0 final (identical to rc4)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: