[libreoffice] 02/02: 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 84b108bb057be2d45e7a4ac7d4fb3494bfd33b55
Merge: 7949bf7 50b401c
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jun 23 00:01:23 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
changelog | 6 ++++++
rules | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --cc changelog
index dd0b16f,6ec496c..fc37098
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,9 +1,20 @@@
+libreoffice (1:5.1.5~rc1~git20160613-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - only initalizes the OpenGL context if we need it (closes: #819153)
+
+ * debian/control.in:
+ - move ttf-liberation-fonts recommends to -common (closes: #747132)
+ - move libpaper-utils recommends to -core
+
+ -- Rene Engelhard <rene@debian.org> Sat, 11 Jun 2016 19:24:08 +0200
+
+ libreoffice (1:5.1.4~rc2-2) unstable; urgency=medium
+
+ * rebuild with clean debian/.. (closes: #827513)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 17 Jun 2016 11:50:22 +0200
+
libreoffice (1:5.1.4~rc2-1) unstable; 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: