[libreoffice] 01/02: fix icon install again - "default" is deprecated/gone
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit 780c964b242d9b3e47737620a0426fcb8e86b324
Author: Rene Engelhard <rene@debian.org>
Date: Sun Sep 14 10:23:03 2014 +0200
fix icon install again - "default" is deprecated/gone
---
changelog | 2 +-
rules | 10 ++--------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/changelog b/changelog
index 500f8a7..f3d30e1 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.4.0~alpha1~git20140912-1) UNRELEASED; urgency=low
+libreoffice (1:4.4.0~alpha1~git20140913-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/rules b/rules
index 8673177..26555c6 100755
--- a/rules
+++ b/rules
@@ -379,7 +379,7 @@ ALLOC=system
SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
DEFAULT_IMAGE=galaxy
-IMAGES:=crystal default $(DEFAULT_IMAGE) hicontrast oxygen tango sifr
+IMAGES:=crystal $(DEFAULT_IMAGE) hicontrast oxygen tango sifr
ENABLE_MYSQLNATIVE=y
USE_MARIADB=n
# set this also to y for system-mysql..
@@ -2903,13 +2903,7 @@ 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; \
- ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/images.zip \
- $(PKGDIR)-style-$(DEFAULT_IMAGE)/$(OODIR)/share/config/images.zip; \
- for i in $(filter-out default,$(IMAGES)); do \
+ 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; \
mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: