[libreoffice] 01/02: Merge remote-tracking branch 'origin/debian-experimental-5.1' 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 de4f4ac54e2815e98e2927545633722290dc99d7
Merge: 9cdeb17 acc710e
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 5 17:06:54 2016 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
Conflicts:
changelog
patches/gcc-6.diff
patches/series
changelog | 15 ++++---
control | 62 ++++++++++++++-------------
libreoffice-common.maintscript | 1 +
libreoffice-common.postinst.in | 16 -------
libreoffice-common.postrm.in | 9 ----
libreoffice-common.preinst.in | 78 ----------------------------------
libreoffice-common.templates.in | 19 ---------
libreoffice-core.preinst.in | 15 -------
patches/gcj-safe-jni-h-include.diff | 2 +-
patches/kfreebsd-openjdk8-JAVAINC.diff | 28 ++++++++++++
patches/series | 1 +
rules | 5 ++-
12 files changed, 77 insertions(+), 174 deletions(-)
diff --cc changelog
index a9974fc,0eae2c7..3cfe606
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
+libreoffice (1:5.2.0~alpha1~git20160203-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@rene-engelhard.de> Thu, 26 Nov 2015 10:37:57 +0100
+
- libreoffice (1:5.1.1~rc1~git20160203-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.1.1~rc1~git20160205-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes scrolling direction with trackpad in gtk3 (closes: #809363)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: