[libreoffice] 04/04: Revert "temporarily disable -kde"
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit a706fec86c6672e393a3ed3a106b3e4ec58f6ffd
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 24 11:37:10 2015 +0200
Revert "temporarily disable -kde"
This reverts commit 59abbc0948e4265529b523443fbfcd295fe40678.
---
changelog | 3 +--
control | 30 +++++++++++++++++++++++++++++-
rules | 2 +-
3 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index 97e05a1..d4b8754 100644
--- a/changelog
+++ b/changelog
@@ -9,8 +9,7 @@ libreoffice (1:5.0.1~rc2-1) UNRELEASED; urgency=medium
- bump libmysqlcppconn-dev and libclucene-dev build-deps to their
gcc 5 versions
- add explicit dh-python build-dependency
- - temporarily disable -kde (KDE uninstallable in sid right now
- anyway) and coinmp
+ - temporarily disable coinmp
- fix autogen.sh for autopkgtests by exporting the needed env vars there,
too
- set TARFILE_LOCATION to tarballs instead of external/tarballs and keep
diff --git a/control b/control
index 53dbece..1da74a0 100644
--- a/control
+++ b/control
@@ -33,6 +33,7 @@ Build-Depends: ant (>= 1.7.0),
java-common (>= 0.49),
javahelper (>= 0.37~),
junit4 (>= 4.8.2-2),
+ kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl,
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
@@ -102,6 +103,7 @@ Build-Depends: ant (>= 1.7.0),
libpoppler-dev (>= 0.12.0),
libpoppler-private-dev,
libpq-dev (>= 9.0~),
+ libqt4-dev (>= 4:4.8),
librdf0-dev (>= 1.0.16-2),
librevenge-dev,
libsane-dev,
@@ -216,7 +218,7 @@ Suggests: cups-bsd,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
imagemagick | graphicsmagick-imagemagick-compat,
libgl1,
- libreoffice-gnome,
+ libreoffice-gnome | libreoffice-kde,
libreoffice-grammarcheck,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version},
@@ -253,6 +255,7 @@ Description: office productivity suite (metapackage)
* libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
* libreoffice-gnome: GIO, GConf backend
+ * libreoffice-kde: KDE UI Plugin and KDE File Picker support
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
automatically
@@ -4271,6 +4274,29 @@ Description: LibreOfficeKit -- headers
.
This package contains the headers needed for using LibreOfficeKit.
+Package: libreoffice-kde
+Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Depends: libreoffice-core (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: ${kde-iconset-dep}
+Suggests: kmail, konqueror, libreoffice-kab
+Section: kde
+Enhances: libreoffice
+Replaces: libreoffice-core (= 1:3.5.0~beta2-1),
+ libreoffice-core (= 1:4.3.0~beta1-1),
+ openoffice.org-kde (<< 1:3.3.0~)
+Description: office productivity suite -- KDE integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the KDE plugin for drawing OOo's widgets with
+ KDE/Qt and a KDEish File Picker when running under KDE.
+ You can extend the functionality of this by installing these packages:
+ .
+ * konqueror / kmail
+ * libreoffice-kab: KDE Addressbook support
+
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
@@ -4352,6 +4378,7 @@ Depends: ant (>= 1.7.0),
java-common (>= 0.49),
javahelper (>= 0.37~),
junit4 (>= 4.8.2-2),
+ kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl,
libbluetooth-dev,
@@ -4423,6 +4450,7 @@ Depends: ant (>= 1.7.0),
libpoppler-dev (>= 0.12.0),
libpoppler-private-dev,
libpq-dev (>= 9.0~),
+ libqt4-dev (>= 4:4.8),
librdf0-dev (>= 1.0.16-2),
libreoffice,
librevenge-dev,
diff --git a/rules b/rules
index fad34b2..09aeff7 100755
--- a/rules
+++ b/rules
@@ -193,7 +193,7 @@ SYSTEM_STUFF += libpagemaker
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
CAIRO_FONTS_PATCH=y
-BUILD_KDE=n
+BUILD_KDE=y
# not ported to KDE 4
ENABLE_KDEAB=n
# < 4.8 fails with gcc 4.7, see #667911
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: