[libreoffice] 01/01: KDE_ICONSET_DEP=libreoffice-style-breeze
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 234cdd84d055504410c624b455515202f8a812f2
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 1 17:28:14 2015 +0200
KDE_ICONSET_DEP=libreoffice-style-breeze
---
changelog | 3 ++-
rules | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index d1dda17..eb10220 100644
--- a/changelog
+++ b/changelog
@@ -6,11 +6,12 @@ libreoffice (1:5.0.0~rc5-1) experimental; urgency=medium
- ENABLE_MERGELIBS=n on kfreebsd-* for now ("Argument list too long")
- ENABLE_COLLADA=y (for i386/amd64) now that the libs finally are in
Debian
+ - KDE_ICONSET_DEP=libreoffice-style-breeze (closes: #794318)
* debian/control.in:
- update -l10n conflicts in -common, remove 3.5/3.6, add 4.3/4.4
(closes: #794024)
- -- Rene Engelhard <rene@debian.org> Fri, 31 Jul 2015 09:49:59 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 01 Aug 2015 14:00:45 +0200
libreoffice (1:5.0.0~rc4-1) experimental; urgency=medium
diff --git a/rules b/rules
index 1645f43..5761621 100755
--- a/rules
+++ b/rules
@@ -1182,7 +1182,11 @@ ifeq "$(BUILD_KDE)" "n"
else
CONFIGURE_FLAGS += --disable-kde
CONFIGURE_FLAGS += --enable-kde4
+ifneq "$(JESSIE_BACKPORT)" "y"
+ KDE_ICONSET_DEP=libreoffice-style-breeze
+else
KDE_ICONSET_DEP=libreoffice-style-oxygen
+endif
BUILD_DEPS += , kdelibs5-dev $(KDELIBS_MINVER)
BUILD_DEPS += , libqt4-dev $(QT_MINVER)
DBG_DBG_SUGGESTS+= , kdelibs5-dbg, libqt4-dbg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: