[libreoffice] 01/03: Merge remote-tracking branch 'origin/debian-experimental-5.0' 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 05b07f6a794f72589b4e949f866b7432eac4a296
Merge: 9874f9a 7560895
Author: Rene Engelhard <rene@debian.org>
Date: Sat Sep 12 23:18:17 2015 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
Conflicts:
changelog
changelog | 11 +++++++----
control | 4 +++-
control.in | 4 +++-
rules | 1 +
4 files changed, 14 insertions(+), 6 deletions(-)
diff --cc changelog
index 3614fae,4259cdd..f250b7d
--- a/changelog
+++ b/changelog
@@@ -1,30 -1,11 +1,32 @@@
+libreoffice (1:5.1.0~alpha1~git20150904-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/patches/generate-g-i-files.diff: add (fixed) patch from gerrit to
+ generate the gobject-introspection stuff for LOKDocView.
+ Soon to be land in master anyway
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,eb} architecture stuff which is now added upstream
+ * debian/uno-libs3.symbols: update
+ * debian/control.lokit.in:
+ - suggest libgtk-3-dev instead of libgtk2.0-dev
+ - suggest gir-1.2-lokdocview-0.1
+ * debian/rules:
+ - remove upstream gone kdeab and gnome-vfs options
+ * debian/control*.in, debian/rules:
+ - package the LOKDocView introspection stuff into gir1.2-lokdocview-0.1
+
+ -- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2015 09:52:38 +0200
+
- libreoffice (1:5.0.2~rc1~git20150904-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.0.2~rc1-1) UNRELEASED; urgency=medium
- * New upstream snapshot
+ * New upstream release candidate
* debian/*.menu: remove, as per TC resolution
- * debian/control.in: remove imagemagick from B-D-I:
+ * debian/control.in:
+ - remove imagemagick from B-D-I:
+ - mention liblibreofficekitgtk.so in -gtks description
* debian/rules:
- stop calling dh_installmenus and stop using convert to convert the icons
to xpm
diff --cc control
index 2209aa0,480e5cf..c41d33d
--- a/control
+++ b/control
@@@ -690,10 -690,11 +691,11 @@@ Description: office productivity suite
.
This package contains the Gtk plugin for drawing LibreOffices widgets
with Gtk+ and a Gtk/GNOMEish File Picker and print dialog when running
- under GNOME. It also contains a QuickStarter for the "notification area".
+ under GNOME. It also contains a QuickStarter for the "notification area"
+ and a (basic) GTK+ document viewer widget.
Package: libreoffice-gtk3
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64eb mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: