[libreoffice] 01/01: 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 d4aefea3992b62a8db6d6ad58cba5be423f778bd
Merge: f2acc2a f7684fa
Author: Rene Engelhard <rene@debian.org>
Date: Sun Mar 27 11:48:42 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
control.gtk3.in
changelog | 11 +++
control | 171 +++++++++++++++++++++++++++++++++++++++--
control.debug.in | 4 +-
control.evolution.in | 1 +
control.gtk3.in | 3 +-
control.help.in | 1 +
control.in | 34 +++++++-
control.kde.in | 1 +
control.lang.in | 1 +
control.ogltrans.in | 1 +
control.postgresql.in | 1 +
control.reportdesign.in | 3 +-
control.sdk.in | 1 +
control.subsequentcheckbase.in | 3 +-
rules | 7 +-
15 files changed, 226 insertions(+), 17 deletions(-)
diff --cc changelog
index 41065a5,3a88b92..25b8b70
--- a/changelog
+++ b/changelog
@@@ -1,17 -1,14 +1,28 @@@
+libreoffice (1:5.2.0~alpha1~git20160321-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - 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
+
+ -- Rene Engelhard <rene@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
+
+ libreoffice (1:5.1.2~rc1-2) UNRELEASED; urgency=medium
+
+ * debian/control*in: add loads of ${misc:Pre-Depends} to packages having
+ .maintscripts calling dir_to_symlink to get proper dpkg Pre-Dependency.
+ Needed e.g. to fix wheezy+wheezy-backports -> jessie+jessie-backports
+ upgrades.
+ * debian/control[,.subsequentcheckbase}.in: remove hardcoded Java depends,
+ use ${java:Depends}
+
+ -- Rene Engelhard <rene@debian.org> Fri, 25 Mar 2016 18:53:37 +0100
+
libreoffice (1:5.1.2~rc1-1) unstable; urgency=medium
* New upstream release candidate
diff --cc control
index 4eada29,1e96c0a..93850eb
--- a/control
+++ b/control
@@@ -675,8 -693,9 +692,9 @@@ Description: office productivity suite
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the LibreOffice option menu.
-Package: libreoffice-gtk
+Package: libreoffice-gtk2
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
+ Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -4279,40 -4431,18 +4433,40 @@@ Description: office productivity suite
Package: gir1.2-lokdocview-0.1
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
Section: introspection
-Depends: libreoffice-gtk3 (= ${binary:Version}),
+Depends: liblibreofficekitgtk (= ${binary:Version}),
${gir:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
+ ${misc:Depends}
Description: GTK3 widget wrapping LibreOffice functionality - introspection
LOKDocView is the GTK3 widget that wraps the libreoffice functionality and
exposes a simple API for applications to use this widget.
.
This package contains the Introspection data.
+Package: liblibreofficekitgtk
+Section: gnome
+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: libreofficekit-data, ${misc:Depends}, ${shlibs:Depends}
+Replaces: libreoffice-gtk3 (<< 1:5.2.0~)
+Breaks: libreoffice-gtk3 (<< 1:5.2.0~)
+Recommends: libreoffice-gtk3
+Description: GTK3 widget wrapping LibreOffice functionality
+ This package contains a (basic) GTK+ document viewer widget (used
+ by e.g. LOKDocView)
+
+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 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+ Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
diff --cc control.gtk3.in
index f59c5c8,be5bf57..0cd4120
--- a/control.gtk3.in
+++ b/control.gtk3.in
@@@ -17,7 -18,7 +18,7 @@@ Description: office productivity suite
Package: gir1.2-lokdocview-0.1
Architecture: %OOO_ARCHS%
Section: introspection
- Depends: ${shlibs:Depends}, ${gir:Depends}, ${misc:Depends}, liblibreofficekitgtk (= ${binary:Version})
-Depends: ${gir:Depends}, ${misc:Depends}, libreoffice-gtk3 (= ${binary:Version})
++Depends: ${gir:Depends}, ${misc:Depends}, liblibreofficekitgtk (= ${binary:Version})
Description: GTK3 widget wrapping LibreOffice functionality - introspection
LOKDocView is the GTK3 widget that wraps the libreoffice functionality and
exposes a simple API for applications to use this widget.
diff --cc control.in
index 11d3c5e,4c5c333..3c2e769
--- a/control.in
+++ b/control.in
@@@ -510,8 -527,9 +527,9 @@@ Description: office productivity suite
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the LibreOffice option menu.
-Package: libreoffice-gtk
+Package: libreoffice-gtk2
Architecture: %OOO_ARCHS%
+ Pre-Depends: ${misc:Pre-Depends}
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: