[libreoffice] 03/03: 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 d3834d6dd3bf8d058a050c5e0061e457e2f6247d
Merge: 697ef61 5877369
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 17 13:27:06 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
changelog | 13 +++++++++++++
control | 6 ++----
control.in | 4 ++--
rules | 5 ++++-
4 files changed, 21 insertions(+), 7 deletions(-)
diff --cc changelog
index b6e573a,cb8c2f3..e6429b9
--- a/changelog
+++ b/changelog
@@@ -1,28 -1,16 +1,41 @@@
+libreoffice (1:5.0.2~rc2~git20150916-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - 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> Tue, 15 Sep 2015 11:35:43 +0200
+
+ libreoffice (1:5.0.1-2) unstable; urgency=medium
+
+ * debian/rules:
+ - disable gtk3 for now again, too shaky
+ (closes: #799251, #799049, #795131)
+ * debian/control.in, debian/rules:
+ - make -gnome depend on -gtk when gtk3 is disabled
+ (reopens: #681180)
+ * debian/control.in:
+ - add Chris Halls <halls@debian.org> back to Uploaders:
+
+ -- Rene Engelhard <rene@debian.org> Thu, 17 Sep 2015 12:35:30 +0200
+
libreoffice (1:5.0.1-1) unstable; urgency=medium
* LibreOffice 5.0.1 final (identical to rc2)
diff --cc control.in
index 28dcadb,a520315..34db63c
--- a/control.in
+++ b/control.in
@@@ -2,9 -2,9 +2,9 @@@ Source: libreoffic
Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
- Uploaders: Rene Engelhard <rene@debian.org>
+ Uploaders: Rene Engelhard <rene@debian.org>, Chris Halls <halls@debian.org>
Build-Depends: %BUILD_DEPS%,
-Build-Depends-Indep: fdupes, imagemagick, %BUILD_DEPS_INDEP%
+Build-Depends-Indep: fdupes, %BUILD_DEPS_INDEP%
Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: