[libreoffice] 01/15: no more special handling for default/galaxy (LP: #1353994)
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 9f4421e843cf32acd1c76a29168228bedef16654
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Aug 21 22:10:21 2014 +0200
no more special handling for default/galaxy (LP: #1353994)
---
changelog | 6 ++++++
rules | 10 +++-------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/changelog b/changelog
index 53f0580..5d6940e 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.3.0-3ubuntu3) UNRELEASED; urgency=medium
+
+ * no more special handling for default/galaxy (LP: #1353994)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 21 Aug 2014 22:07:26 +0200
+
libreoffice (1:4.3.0-3ubuntu2) utopic; urgency=medium
* MIR: Caladea and Carlito from Writer for metric compatibilty (LP: #1276252)
diff --git a/rules b/rules
index b205ac2..e6711a9 100755
--- a/rules
+++ b/rules
@@ -691,7 +691,7 @@ endif
ifeq "$(DEB_VENDOR)" "Ubuntu"
IMAGES+=human
- CONFIGURE_FLAGS_INDEP+= --with-theme="$(patsubst $(DEFAULT_IMAGE),default,$(IMAGES))"
+ CONFIGURE_FLAGS_INDEP+= --with-theme="$(IMAGES)"
ENABLE_FIREBIRD=n
# lp#1034560: MIR troubles make it easier to use internal jfreereport
SYSTEM_STUFF := $(filter-out jfreereport npapi-headers, $(SYSTEM_STUFF))
@@ -2893,9 +2893,7 @@ ifeq "$(ENABLE_HELP)" "n"
# will need them
set -e; \
for i in $(IMAGES); do \
- s=_$$i.zip; \
- case "$$i" in $(DEFAULT_IMAGE)) s=.zip; esac; \
- z=images$$s; \
+ z=images_$$i.zip; \
echo "adding helpimgs to $$z..."; \
rm -rf $$z; mkdir $$z; \
cd $$z; \
@@ -2912,9 +2910,7 @@ endif
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 galaxy,$(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: