[libreoffice] 02/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 d9a0a773353caf64f89e1af4b7783ac8cf9f1ba2
Merge: dd85557 1fe8439
Author: Rene Engelhard <rene@debian.org>
Date: Sun Feb 21 13:48:56 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
changelog | 19 ++++++++++++++
control | 64 ++++++++++++++++++++++-----------------------
control.in | 2 +-
rules | 2 +-
scripts/get_libebook_dep.sh | 23 ++++++++++------
5 files changed, 68 insertions(+), 42 deletions(-)
diff --cc changelog
index f51bef2,56adaa1..b9e0106
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,12 +1,18 @@@
+libreoffice (1:5.2.0~alpha1~git20160220-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@rene-engelhard.de> Thu, 26 Nov 2015 10:37:57 +0100
+
+ libreoffice (1:5.1.1~rc1-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - somewhen m68k vanished from OOO_ARCHS; readd ;)
+ * debian/scripts/get_libebook_dep.sh: fix to work with new multiarchified
+ libebook
+
+ -- Rene Engelhard <rene@debian.org> Tue, 16 Feb 2016 13:06:26 +0100
+
libreoffice (1:5.1.1~rc1-1) unstable; urgency=medium
* New upstream release candidate
diff --cc control
index 2f2bf03,3bbb329..d22a237
--- a/control
+++ b/control
@@@ -4286,19 -4287,8 +4286,19 @@@ Description: GTK3 widget wrapping Libre
.
This package contains the Introspection data.
+Package: libreofficekit-data
+Architecture: all
+Section: web
+Recommends: gir1.2-lokdocview-0.1
+Description: common data for LOKDocView
+ LOKDocView is the GTK3 widget that wraps the libreoffice functionality and
+ exposes a simple API for applications to use this widget.
+ .
+ This package contains architecture-independent data (e.g. the selection
+ handlers).
+
Package: libreoffice-kde
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+ Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 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: