[libreoffice] 01/02: fix theme build

[Rene Engelhard]

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 431becbfc2338d7556fdd383f8038bb4204fe277
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Jun 7 06:32:34 2017 +0200

    fix theme build
    
    we didn't specify --with-theme= at all so it just happens that we
    matched the default. Now oxygen is gone and we expect it and it breaks.
    Build with galaxy only in arch-dep. Remove installing of tango_testing
    whihch isn't included in our --with-theme=
---
 rules | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/rules b/rules
index 9b00d21..a369c01 100755
--- a/rules
+++ b/rules
@@ -416,7 +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
+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..
@@ -546,8 +547,8 @@ CONFIGURE_FLAGS= \
 		--disable-fetch-external \
 		--without-fonts \
 		--without-myspell-dicts \
-		--with-branding=$(CURDIR)/debian/branding
-CONFIGURE_FLAGS_INDEP=
+		--with-branding=$(CURDIR)/debian/branding \
+		--with-theme="$(DEFAULT_IMAGE)"
 
 ifeq "$(ENABLE_HELP)" "y"
 CONFIGURE_FLAGS_INDEP+= --with-help
@@ -3060,10 +3061,6 @@ endif
 		ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/$$z \
 			$(PKGDIR)-style-$$p/$(OODIR)/share/config/$$z; \
 	done
-  ifeq "$(RELEASE_BUILD)" "n"
-	mv $(PKGDIR)-common/$(OODIR)/share/config/tango_testing.zip \
-		$(PKGDIR)-style-tango/$(OODIR)/share/config
-  endif
 
 ifeq "$(DEB_VENDOR)" "Debian"
 	# install Debian presentation template

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git