[libreoffice] 01/04: fix icon installation in install-indep; we need to iterate over $(IMAGES)...

Rene Engelhard rene at moszumanska.debian.org
Thu Jun 8 19:59:05 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 00ee229f04f06a0dbde43a9d3b41b4a68c4abf1a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Jun 8 13:30:36 2017 +0200

    fix icon installation in install-indep; we need to iterate over $(IMAGES)...
---
 changelog | 1 +
 rules     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 8f4bede..27a9018 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ libreoffice (1:5.4.0~beta2-2) UNRELEASED; urgency=medium
   * debian/rules:
     - try harder and also export LC_ALL=C.UTF-8 for uitest as the
       buildd/sbuild sets LC_ALL=POSIX already
+    - fix icon installation in install-indep
 
  -- Rene Engelhard <rene at debian.org>  Thu, 08 Jun 2017 07:21:18 +0200
 
diff --git a/rules b/rules
index 28c7cec..2f08473 100755
--- a/rules
+++ b/rules
@@ -416,8 +416,8 @@ 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"
-CONFIGURE_FLAGS_INDEP += --with-theme=$(IMAGES)
+IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr sifr_dark breeze breeze_dark
+CONFIGURE_FLAGS_INDEP += --with-theme="$(IMAGES)"
 ENABLE_MYSQLNATIVE=y
 MYSQL_FLAVOUR=default
 # set this also to y for system-mysql..

-- 
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