[libreoffice] 04/15: remove yet another default special casing
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-utopic-4.3
in repository libreoffice.
commit a12c6d3ee884c97ace973ea8999445dbd7fe0904
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Aug 27 01:50:13 2014 +0200
remove yet another default special casing
---
rules | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/rules b/rules
index f32da6b..daa767c 100755
--- a/rules
+++ b/rules
@@ -403,8 +403,7 @@ SYSTEM_STUFF += harfbuzz
ALLOC=system
SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
-DEFAULT_IMAGE=galaxy
-IMAGES:=crystal $(DEFAULT_IMAGE) hicontrast oxygen tango sifr
+IMAGES:=crystal galaxy hicontrast oxygen tango sifr
ENABLE_MYSQLNATIVE=y
USE_MARIADB=n
# set this also to y for system-mysql..
@@ -2906,10 +2905,6 @@ ifeq "$(ENABLE_HELP)" "n"
done
endif
set -e; \
- mkdir -p $(PKGDIR)-style-$(DEFAULT_IMAGE)/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
- mv $(PKGDIR)-common/$(OODIR)/share/config/images.zip \
- $(PKGDIR)-style-$(DEFAULT_IMAGE)/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
- mkdir -p $(PKGDIR)-style-$(DEFAULT_IMAGE)/$(OODIR)/share/config; \
for i in $(IMAGES); do \
z=images_$$i.zip; p=$$i; \
mkdir -p $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: