[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-4-9-g39f9dd4
The following commit has been merged in the master branch:
commit 39f9dd423e1889f2fc522c8eb2b83e3758889df2
Author: Rene Engelhard <rene@debian.org>
Date: Sun Mar 4 17:11:17 2012 +0100
don't add LIBSUFFIX/PLATFORMID to .triggers
diff --git a/rules b/rules
index 4347dc5..d987d3b 100755
--- a/rules
+++ b/rules
@@ -2110,7 +2110,7 @@ $(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*Env*.sh) $(wildcard debia
MAINTSCRIPT=debian/$$PKG.$$FILE ; \
if [ -e $$MAINTSCRIPT.in ]; then \
sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' > $$MAINTSCRIPT; \
- if echo $(ARCH_DEP_PACKAGES) | grep -q $$PKG; then \
+ if echo $(ARCH_DEP_PACKAGES) | grep -q $$PKG && [ "$$FILE" != "triggers" ]; then \
grep LIBSUFFIX debian/vars.$(ARCH) >> $$MAINTSCRIPT; \
grep PLATFORMID debian/vars.$(ARCH) >> $$MAINTSCRIPT; \
fi; \
--
LibreOffice packaging repository
Reply to: