[libreoffice] 01/01: 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 c55f2de05f4426386a8b63fbd6d93e198301ac90
Merge: 7f11ae5 4913184
Author: Rene Engelhard <rene@debian.org>
Date: Sun Apr 17 12:01:36 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --cc changelog
index 65fc86d,c1a4d9d..284b8bb
--- a/changelog
+++ b/changelog
@@@ -1,23 -1,16 +1,30 @@@
-libreoffice (1:5.1.3~rc1~git20160411-1) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0~alpha1~git20160411-1) UNRELEASED; urgency=medium
* New upstream snapshot
-
- -- Rene Engelhard <rene@debian.org> Sat, 02 Apr 2016 12:48:35 +0200
+ - 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
+ * debian/control.sdk.in, debian/rules: move arch-indep SDK stuff into new
+ -dev-common. Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to
+ (re)build unowinreg.dll in build-indep. Remove arch-qualifiers.
+ * debian/uno-libs3.symbols: update
+ * debian/tests/control.in, debian/tests/sdk-examples: remove unowinreg.dll
+ special-casing, we now have unowinreg.dll in a Arch: all. Depend on that.
+
+ -- Rene Engelhard <rene@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
+ libreoffice (1:5.1.2-4) unstable; urgency=medium
+
+ * debian/patches/fix-list-and-comboboxes-with-gtk3-3-20-2.diff:
+ backport from libreoffice-5-1 branch, as name says
+
+ -- Rene Engelhard <rene@debian.org> Sat, 16 Apr 2016 17:55:25 +0200
+
libreoffice (1:5.1.2-3) unstable; urgency=medium
* debian/patches/don-t-install-qstart.desktop-if-it-s-disabled.diff:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: