[libreoffice] 03/03: disable -kde and the (unmaintained for LO) oxygen theme
Rene Engelhard
rene at moszumanska.debian.org
Thu Aug 17 05:58:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit e484318397ae407b418a55955c64104324a85e10
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Wed Aug 16 14:36:50 2017 +0200
disable -kde and the (unmaintained for LO) oxygen theme
---
changelog | 3 +++
control | 39 +--------------------------------------
control.in | 15 ---------------
rules | 4 ++--
4 files changed, 6 insertions(+), 55 deletions(-)
diff --git a/changelog b/changelog
index 3a7dceb..05b74cd 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,9 @@ libreoffice (1:5.4.1~rc1-1) UNRELEASED; urgency=medium
* debian/rules:
- run dh_strip_nondeterminism
+ - disable -kde and the (unmaintained for LO) oxygen theme.
+ Qt4 should go away. See
+ https://lists.debian.org/debian-devel-announce/2017/08/msg00006.html
-- Rene Engelhard <rene at debian.org> Sat, 12 Aug 2017 10:36:57 +0200
diff --git a/control b/control
index 5a42af9..53dad15 100644
--- a/control
+++ b/control
@@ -41,7 +41,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
java-common (>= 0.49),
javahelper (>= 0.37~),
junit4 (>= 4.8.2-2) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
- kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl [!hppa !ia64 !mips64 !s390 !sparc],
libavahi-client-dev,
@@ -120,7 +119,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
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,
@@ -231,7 +229,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}),
@@ -371,7 +369,6 @@ Architecture: all
Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
Suggests: libreoffice-style-breeze,
libreoffice-style-hicontrast,
- libreoffice-style-oxygen,
libreoffice-style-sifr,
libreoffice-style-tango
Recommends: fonts-liberation | ttf-mscorefonts-installer,
@@ -395,8 +392,6 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-galaxy (>= 1:${next-oover}~),
libreoffice-style-hicontrast (<< 1:${oover}~),
libreoffice-style-hicontrast (>= 1:${next-oover}~),
- libreoffice-style-oxygen (<< 1:${oover}~),
- libreoffice-style-oxygen (>= 1:${next-oover}~),
libreoffice-style-tango (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
libreoffice-writer2latex (<< 1.0.2-9),
@@ -525,18 +520,6 @@ Description: office productivity suite -- database
.
This package contains the database component for LibreOffice.
-Package: libreoffice-style-oxygen
-Architecture: all
-Enhances: libreoffice-core
-Depends: libreoffice-style-tango, ${misc:Depends}
-Suggests: kde-icons-oxygen, oxygencursors
-Provides: libreoffice-style
-Description: office productivity suite -- Oxygen symbol style
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the "oxygen" symbol style, default style for KDE 4.
-
Package: libreoffice-style-breeze
Architecture: all
Enhances: libreoffice-core
@@ -4273,26 +4256,6 @@ Description: common data for LOKDocView
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 sparc64
-Depends: libreoffice-core (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: ${kde-iconset-dep}
-Suggests: kmail, konqueror
-Section: kde
-Enhances: libreoffice
-Replaces: libreoffice-core (= 1:4.3.0~beta1-1)
-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
-
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
diff --git a/control.in b/control.in
index 6eb2706..b99595b 100644
--- a/control.in
+++ b/control.in
@@ -193,7 +193,6 @@ Architecture: all
Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
Suggests: libreoffice-style-breeze,
libreoffice-style-hicontrast,
- libreoffice-style-oxygen,
libreoffice-style-sifr,
libreoffice-style-tango
Recommends: ${pyuno-depends}, ${textcat-data-recommends}, fonts-liberation | ttf-mscorefonts-installer
@@ -215,8 +214,6 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-galaxy (>= 1:${next-oover}~),
libreoffice-style-hicontrast (<< 1:${oover}~),
libreoffice-style-hicontrast (>= 1:${next-oover}~),
- libreoffice-style-oxygen (<< 1:${oover}~),
- libreoffice-style-oxygen (>= 1:${next-oover}~),
libreoffice-style-tango (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
libreoffice-writer2latex (<< 1.0.2-9),
@@ -345,18 +342,6 @@ Description: office productivity suite -- database
.
This package contains the database component for LibreOffice.
-Package: libreoffice-style-oxygen
-Architecture: all
-Enhances: libreoffice-core
-Depends: libreoffice-style-tango, ${misc:Depends}
-Suggests: kde-icons-oxygen, oxygencursors
-Provides: libreoffice-style
-Description: office productivity suite -- Oxygen symbol style
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the "oxygen" symbol style, default style for KDE 4.
-
Package: libreoffice-style-breeze
Architecture: all
Enhances: libreoffice-core
diff --git a/rules b/rules
index b022abb..b76139f 100755
--- a/rules
+++ b/rules
@@ -191,7 +191,7 @@ SYSTEM_STUFF += libstaroffice
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
CAIRO_FONTS_PATCH=y
-BUILD_KDE=y
+BUILD_KDE=n
# < 4.8 fails with gcc 4.7, see #667911
QT_MINVER= (>= 4:4.8)
KDELIBS_MINVER= (>= 4:4.3.4)
@@ -406,7 +406,7 @@ SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
CPPUNIT_MINVER=1.14
DEFAULT_IMAGE=galaxy
-IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr sifr_dark breeze breeze_dark
+IMAGES:=$(DEFAULT_IMAGE) hicontrast tango sifr sifr_dark breeze breeze_dark
CONFIGURE_FLAGS_INDEP += --with-theme="$(IMAGES)"
ENABLE_MYSQLNATIVE=y
MYSQL_FLAVOUR=default
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list