[libreoffice] 01/01: 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 a2eed749a22c77beba3187f50f97e63411c6a2e2
Merge: 4913184 99924ff
Author: Rene Engelhard <rene@debian.org>
Date: Tue Apr 19 20:27:43 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
patches/series
changelog | 13 ++++++++++++-
control | 2 +-
rules | 7 ++++++-
tests/control | 2 +-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --cc changelog
index c1a4d9d,4a80494..1b54ca9
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,14 +1,20 @@@
- libreoffice (1:5.1.3~rc1~git20160411-1) UNRELEASED; urgency=medium
++libreoffice (1:5.1.3~rc1~git20160419-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Apr 2016 12:48:35 +0200
+
+ libreoffice (1:5.1.2-5) UNRELEASED; urgency=medium
+
+ * debian/patches/remove-obsolete-dictmgr-include.diff: as name says;
+ from libreoffice-5-1 branch. Fix build with hunspell 1.4
+
+ * debian/rules:
+ - (temporarily) bump libgtk-3-dev build-dep to >= 3.20~ to ensure
+ we build against 3.20
+
+ -- Rene Engelhard <rene@debian.org> Tue, 19 Apr 2016 20:02:18 +0200
+
libreoffice (1:5.1.2-4) unstable; urgency=medium
* debian/patches/fix-list-and-comboboxes-with-gtk3-3-20-2.diff:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: