[libreoffice] 01/01: Merge remote-tracking branch 'origin/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 a533e6983189b26879f7c77c52ffc85d4530d0af
Merge: 5745f09 eb41b54
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 16 05:00:26 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
changelog | 9 +++++++++
control | 2 +-
control.mysql.in | 2 +-
rules | 26 ++++++++++++++++----------
4 files changed, 27 insertions(+), 12 deletions(-)
diff --cc changelog
index 171552d,262af29..cd0a3cd
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,14 +1,30 @@@
-libreoffice (1:5.2.0-3) UNRELEASED; urgency=medium
++libreoffice (1:5.2.1~rc1-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
- - filter-out kfreebsd-i386 and kfreebsd-amd64 explicitly out of
- OOO_CHECK_ARCHS to save unneeded build-deps (again)
+ - rework MySQL/MariaDB conditionals; allow default-libmysqlclient-dev
+ * debian/control.mysql.in: add default-mysql-server as first alternative
+ to the Suggests
+
+ -- Rene Engelhard <rene@debian.org> Tue, 16 Aug 2016 04:45:09 +0200
+
+libreoffice (1:5.2.1~rc1-1) experimental; urgency=medium
+
+ * new upstream release candidate
+ - drop use of CAIRO_OPERATOR_DIFFERENCE, should fix performance
+ regressions (closes: #832495)
+
+ * debian/rules, debian/control.transitionals.in: readd -gtk as transitional
+ package; depend on -gtk2 (closes: #833676), recommend -systray only
+ * debian/rules: re-enable systray (closes: #825642) now that we need
+ NEW anyway and have a -gtk transitional package (which contained this
+ before it was disabled)
+ * debian/control.gtk2.in: stop providing libreoffice-gtk
+ * debian/rules:
+ - filter-out kfreebsd-i386 and kfreebsd-amd64 explicitly out of
+ OOO_CHECK_ARCHS to save unneeded build-deps (again)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 15 Aug 2016 18:59:23 +0200
+
libreoffice (1:5.2.0-2) unstable; urgency=medium
* debian/patches/make-package-modules-not-suck.diff: move animcore into
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: