[libreoffice] 03/04: move images_helpimg.zip to usr/share like the others; remove obsolete helpimg mangling in the "other" images_*.zip

[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 adfb15b90c7e0776909aa4ca621a2118dbfa001d
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 4 11:15:21 2017 +0200

    move images_helpimg.zip to usr/share like the others; remove obsolete helpimg mangling in the "other" images_*.zip
---
 changelog |  3 ++-
 rules     | 23 ++---------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/changelog b/changelog
index d69672d..d785652 100644
--- a/changelog
+++ b/changelog
@@ -6,7 +6,8 @@ libreoffice (1:5.4.1-2) UNRELEASED; urgency=medium
       (RUN_MAKE_CHECK=n on BE archs)...
     - add build-depdendencies on ah-autoreconf and dh-strip-nondeterminism 
       to plase lintian and its inconsequence
-       to plase lintian and its inconsequence
+    - move images_helpimg.zip to usr/share like the others; remove obsolete
+      helpimg mangling in the "other" images_*.zip
   * debian/control.systray.in: suggest gnome-shell-extension-top-icons-plus
     given https://blogs.gnome.org/aday/2017/08/31/status-icons-and-gnome/
 
diff --git a/rules b/rules
index 964def0..f8cdc33 100755
--- a/rules
+++ b/rules
@@ -3056,29 +3056,10 @@ endif
 	install -m 644 debian/soffice.sh \
 	  $(PKGDIR)-common/etc/$(OODIRNAME)/soffice.sh
 
-ifeq "$(ENABLE_HELP)" "n"
-	# the helpimgs are not included when we don't build with help here.
-	# Add them now because libreoffice-help-* packaged in contrib or so
-	# will need them
-	set -e; \
-	for i in $(IMAGES); do \
-		s=_$$i.zip; \
-		case "$$i" in default) s=.zip; esac; \
-		z=images$$s; \
-		echo "adding helpimgs to $$z..."; \
-		rm -rf $$z; mkdir $$z; \
-		cd $$z; \
-		unzip -q $(CURDIR)/$(PKGDIR)-common/$(OODIR)/share/config/$$z && \
-		cp -r $(CURDIR)/$(SOURCE_TREE)/default_images/res/helpimg res && \
-		chmod +w $(CURDIR)/$(PKGDIR)-common/$(OODIR)/share/config/$$z && \
-		zip -q -r $(CURDIR)/$(PKGDIR)-common/$(OODIR)/share/config/$$z *; \
-		cd ..; \
-		rm -rf $$z; \
-	done
-endif
 	set -e; \
-	for i in $(IMAGES); do \
+	for i in $(IMAGES) helpmimg; 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; \

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