[libreoffice] 02/06: 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 59abbc0948e4265529b523443fbfcd295fe40678
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 20 10:24:50 2015 +0200
temporarily disable -kde
---
changelog | 2 ++
control | 30 +-----------------------------
rules | 2 +-
3 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/changelog b/changelog
index 82aee02..d67a815 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
* debian/rules:
- bump libmysqlcppconn-dev build-dep to its gcc 5 rebuild
- add explicit dh-python build-dependency
+ - temporarily disable -kde (KDE uninstallable in sid right now
+ anyway)
-- Rene Engelhard <rene@debian.org> Wed, 12 Aug 2015 15:23:58 +0200
diff --git a/control b/control
index 0d8dd83..c60483d 100644
--- a/control
+++ b/control
@@ -35,7 +35,6 @@ 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],
@@ -105,7 +104,6 @@ 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,
@@ -220,7 +218,7 @@ Suggests: cups-bsd,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
imagemagick | graphicsmagick-imagemagick-compat,
libgl1,
- libreoffice-gnome | libreoffice-kde,
+ libreoffice-gnome,
libreoffice-grammarcheck,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version},
@@ -257,7 +255,6 @@ 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
@@ -4276,29 +4273,6 @@ 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
@@ -4382,7 +4356,6 @@ 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,
@@ -4454,7 +4427,6 @@ 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 4aadf85..d610e8a 100755
--- a/rules
+++ b/rules
@@ -193,7 +193,7 @@ SYSTEM_STUFF += libpagemaker
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
CAIRO_FONTS_PATCH=y
-BUILD_KDE=y
+BUILD_KDE=n
# 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: