[libreoffice] 03/03: Merge remote-tracking branch 'origin/master' 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 ae0328975546e8a0b92e9fe388f69a21b7b3b28c
Merge: 22c940b 2651716
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 26 09:40:55 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
changelog | 2 ++
rules | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --cc changelog
index d97a867,2f4bddb..5643151
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,14 +1,23 @@@
-libreoffice (1:5.0.5~rc1-2) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~rc2-2) UNRELEASED; urgency=medium
+
+ * debian/patches/gcc-6.diff: backport gcc 6 compile/test fixes from master
+ (closes: #811686)
+ * debian/patches/GCC-6-PR69273-workaround.diff: add gcc 6 ICE workaround
+ from Stephan Bergmann
* debian/rules:
+ - -officebean is a arch-dep package, move pom generation and mh_*
+ calls for it to install-arch...
+ - adapt for changed debhelper internals to make out -dbgsym hacks work
+ again and build-depend on debhelper >= 9.20160115
+ - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
+ openjdks and add openjdk-8-jre
- -- Rene Engelhard <rene@debian.org> Tue, 26 Jan 2016 09:35:18 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Dec 2015 01:50:15 +0100
-libreoffice (1:5.0.5~rc1-1) unstable; urgency=medium
+libreoffice (1:5.1.0~rc2-1) experimental; urgency=medium
- * New upstream release candidate
+ * New upstream release candidate
* debian/patches/disable-db-tests.diff,
debian/patches/smoketest-disable-extension-tests.diff: make apply again...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: