[libreoffice] 01/02: Merge remote-tracking branch 'origin/master' 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 5a01832eb264384426992e309f6a053c47041930
Merge: d4aefea ede1244
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 29 19:38:57 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
patches/series
rules
changelog | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --cc changelog
index 25b8b70,1e4ba3f..46022e0
--- a/changelog
+++ b/changelog
@@@ -1,18 -1,9 +1,23 @@@
- libreoffice (1:5.2.0~alpha1~git20160321-1) UNRELEASED; urgency=medium
++libreoffice (1:5.2.0~alpha1~git20160329-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - fixes SVG t(ext s)pan import (closes: #665094)
+
+ * debian/rules, debian/control.gtk3.in, debian/*.links: move
+ liblibreofficekitgtk.so into an own package, as we have
+ libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on
+ libreofficekit-data
+ * debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
+ to -gtk2
+
+ -- Rene Engelhard <rene@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
+
- libreoffice (1:5.1.2~rc1-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/OPENCL_DLL_NAME.diff: backport from master, use .so.1,
+ not .so
* debian/control*in: add loads of ${misc:Pre-Depends} to packages having
.maintscripts calling dir_to_symlink to get proper dpkg Pre-Dependency.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: