[libreoffice] 01/03: 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 6c08a18c60c61225d1640b0e63a81df2c611c68c
Merge: 117e06d 2d84a5a
Author: Rene Engelhard <rene@debian.org>
Date: Thu Dec 17 19:59:47 2015 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
Conflicts:
changelog
patches/series
changelog | 13 ++++++++++++-
control | 2 --
rules | 8 ++++----
shlibs.override.orcus | 3 ++-
4 files changed, 18 insertions(+), 8 deletions(-)
diff --cc changelog
index 8bf555a,ab6085b..3c5d3b7
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,14 +1,20 @@@
- libreoffice (1:5.2.0~alpha1~git20151205-1) UNRELEASED; urgency=medium
++libreoffice (1:5.2.0~alpha1~git20151217-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.0~rc1-1) experimental; urgency=medium
+
+ * New upstream release candidate
+ - doesn't link evoab2 to gtk2 anymore (closes: #807640)
+
+ * debian/patches/disable-npapi-plugin-support.diff: as name says,
+ the only serious usecase is the doomed Flash anyway and it's
+ causes a link against gtk2 in -core (closes: #807601)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 16 Dec 2015 10:15:06 +0100
+
libreoffice (1:5.1.0~beta2-1) experimental; urgency=medium
* New upstream beta release
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: