This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit aa067e53fe56521ca37b46ac39240fc34b478f5f
Merge: 8c50ec3 27073d4
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 16 05:27:23 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.2' into
debian-experimental-5.3
Conflicts:
changelog
changelog | 22 +++++++++++++---------
control | 2 +-
control.mysql.in | 2 +-
rules | 28 +++++++++++++++++-----------
4 files changed, 32 insertions(+), 22 deletions(-)
diff --cc changelog
index d815ee5,cd0a3cd..349bf3f
--- a/changelog
+++ b/changelog
@@@ -1,15 -1,13 +1,24 @@@
+libreoffice (1:5.3.0~alpha0~git20160811-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/control.{lang,help}.in: use ${help-l10n-virtual-version} as
+ versioned Provides
+ * debian/rules, debian/control.transitionals.in: remove jessie->stretch
+ transitionals again
+
+ -- Rene Engelhard <r...@debian.org> Thu, 26 May 2016 20:00:57 +0200
+
- libreoffice (1:5.2.1~rc1-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.2.1~rc1-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - rework MySQL/MariaDB conditionals; allow default-libmysqlclient-dev
+ * debian/control.mysql.in: add default-mysql-server as first alternative
+ to the Suggests
+
+ -- Rene Engelhard <r...@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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
