This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit f09fc518dae86650b511288b144896ffdb29b4a8
Merge: ad96a80 62b9457
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Jul 13 14:57:09 2015 +0200
Merge tag 'libreoffice_5.0.0_rc3-1' into ubuntu-wily-5.0
tag libreoffice 1:5.0.0~rc3-1
Conflicts:
changelog
changelog | 14 ++++++++++++--
rules | 26 +++++++++++++-------------
2 files changed, 25 insertions(+), 15 deletions(-)
diff --cc changelog
index d7cd6fb,1588f21..efb3587
--- a/changelog
+++ b/changelog
@@@ -1,15 -1,13 +1,25 @@@
- libreoffice (1:5.0.0~rc3-0ubuntu1~wily1) wily; urgency=medium
++libreoffice (1:5.0.0~rc3-1ubuntu1~wily1) wily; urgency=medium
+
- * new upstream rc
++ * merge from Debian
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 10 Jul 2015 19:18:44 +0200
+
+ libreoffice (1:5.0.0~rc3-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - re-enable CVE tests on all platforms again now that the infinite loop with
+ unsigned char-default is supposedly fixed
+
+ -- Rene Engelhard <rene@debian.org> Sun, 12 Jul 2015 13:04:30 +0200
+
+libreoffice (1:5.0.0~rc2-1ubuntu1~wily1) wily; urgency=medium
+
+ * merge from debian
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 30 Jun 2015 13:49:59 +0200
+
libreoffice (1:5.0.0~rc2-1) experimental; urgency=medium
* New upstream release candidate
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git