[libreoffice] 02/02: 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 5fc6e21af87779b21e54fe8c71e4fe5572607b1f
Merge: 688d7a9 718ba10
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 14 21:14:02 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
changelog | 11 +++++------
control | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --cc changelog
index b4f6af4,f93700a..3187bb3
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,4 +1,10 @@@
+libreoffice (1:5.2.1~rc1-1) UNRELEASED; urgency=medium
+
+ * new upstream release candidate
+
- * debian/rules:
- - clean up test disabling, disable on sparc64. Add missing <!nocheck>
- for junit4
-
+ -- Rene Engelhard <rene@debian.org> Thu, 11 Aug 2016 20:30:24 +0200
+
- libreoffice (1:5.2.0-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.2.0-2) unstable; urgency=medium
* debian/patches/make-package-modules-not-suck.diff: move animcore into
DRAW (closes: #833181)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: