[libreoffice] 01/02: oops, there obviously is no -style-common, so move helpimg out of the loop...

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit b3cafb66a0c61c5d481595de1bbb9e6cfe0f754b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Sep 12 04:22:23 2017 +0200

    oops, there obviously is no -style-common, so move helpimg out of the loop...
---
 rules | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/rules b/rules
index 3c5158e..8e41a07 100755
--- a/rules
+++ b/rules
@@ -3057,9 +3057,8 @@ endif
 	  $(PKGDIR)-common/etc/$(OODIRNAME)/soffice.sh
 
 	set -e; \
-	for i in $(IMAGES) helpimg; do \
+	for i in $(IMAGES); do \
 		z=images_$$i.zip; p=$$i; \
-		if [ "$$i" = "helpimg" ]; then p=common; fi; \
 		if [ "$$i" = "breeze_dark" ]; then p=breeze; fi; \
 		if [ "$$i" = "sifr_dark" ]; then p=sifr; fi; \
 		mkdir -p $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
@@ -3069,6 +3068,12 @@ endif
 		ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/$$z \
 			$(PKGDIR)-style-$$p/$(OODIR)/share/config/$$z; \
 	done
+	mkdir -p $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
+	mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
+		$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/; \
+	mkdir -p $(PKGDIR)-common/$(OODIR)/share/config; \
+	ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/$$z \
+		$(PKGDIR)-common/$(OODIR)/share/config/$$z; \
 
 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