[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 7eb6a3c988cb40af7c8aad7c183a84ab8a1485a3
Merge: e1d0643 c6f23b9
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 17 19:57:41 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
changelog | 5 ++++-
patches/disable-mediaembedding-test.diff | 37 --------------------------------
2 files changed, 4 insertions(+), 38 deletions(-)
diff --cc changelog
index bda6afd,8414b20..f141d1b
--- a/changelog
+++ b/changelog
@@@ -1,30 -1,8 +1,33 @@@
+libreoffice (1:5.0.2~rc2-1) UNRELEASED; urgency=medium
+
+ * New upstream release candidate
+ - fixes crash on gestureLongPress (closes: #798591)
+
+ * debian/*.menu: remove, as per TC resolution
+ * debian/control.in:
+ - remove imagemagick from B-D-I:
+ - mention liblibreofficekitgtk.so in -gtks description
+ - various lintian fixes
+ + add ${misc:Depends}, remove duplicated Priority:
+ + make fonts-opensymbol Multi-Arch: foreign
+ + don't add unneeded XS-Python3-Version:
+ * debian/rules:
+ - stop calling dh_installmenus and stop using convert to convert the icons
+ to xpm
+ - move liblibreofficekitgtk.so into -gtk
+ - lintian fixes:
+ + don't add XS-Testsuite; it defaults to autopkgtest anyway
+ if idebian/tests/control exists
+ + move dh_fixperms after gdb helper install to fix permissions of the
+ gdb stuff
+
+ -- Rene Engelhard <rene@debian.org> Thu, 17 Sep 2015 18:20:07 +0200
+
libreoffice (1:5.0.1-2) unstable; urgency=medium
+ * debian/patches/series, debian/patches/disable-mediaembedding-test.diff:
+ remove, GTK3 is now disabled
+
* debian/rules:
- disable gtk3 for now again, too shaky
(closes: #799251, #799049, #795131)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: