[libreoffice] 04/04: Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit e7d33a0db546fc995a0fa04772d0aade466204ed
Merge: 7ec2405 62b9457
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jul 12 13:22:02 2015 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
Conflicts:
changelog
rules
changelog | 10 ++++++++++
rules | 24 ++++++++++++------------
2 files changed, 22 insertions(+), 12 deletions(-)
diff --cc changelog
index d8ac6c9,1588f21..5c75759
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,13 +1,22 @@@
+libreoffice (1:5.1.0~alpha1~git20150712-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,eb} architecture stuff which is now added upstream
+
+ -- Rene Engelhard <rene@debian.org> Mon, 01 Jun 2015 20:29:43 +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-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
Reply to: