[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.5_rc2-1-5-g931f011
The following commit has been merged in the debian-experimental-3.6 branch:
commit 931f0114b2d3867dfefccc5661eb712dae8ed368
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jan 24 20:58:29 2013 +0100
fix trigger to actually be in effect
diff --git a/changelog b/changelog
index c52f406..8969e0c 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,8 @@ libreoffice (1:3.6.5~rc2-2) UNRELEASED; urgency=low
* debian/rules:
- stop using lsb_release -cs, parse dpkg-parsechangelog instead.
avoids the base-files issue.
- * debian/libreoffice-common.triggers.in:
- - fix: s/activate/interest/
+ * debian/libreoffice-common.triggers.in, debian/rules:
+ - fix trigger to actually be in effect
-- Rene Engelhard <rene@debian.org> Tue, 22 Jan 2013 00:29:09 +0100
diff --git a/rules b/rules
index bd2da0e..a7c7ca3 100755
--- a/rules
+++ b/rules
@@ -1881,7 +1881,7 @@ $(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.
grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) >> $$MAINTSCRIPT; \
fi; \
echo "" >> $$MAINTSCRIPT; \
- if egrep -q "validate_extension" $$MAINTSCRIPT.in; then \
+ if egrep -q "(validate_extension|sync_extension)" $$MAINTSCRIPT.in; then \
cat debian/shell-lib-extensions.sh >> $$MAINTSCRIPT; \
fi; \
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
--
LibreOffice packaging repository
Reply to: