------------------------------------------------------------
revno: 1704
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-10-14 09:48:08 +0200
message:
fix it correctly, only add extension stuff when we call the function, avoid
false positives ("extensionmgr.desktop")
modified:
broffice.org.postrm.in
broffice.org.preinst.in
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2009-10-14 07:40:37 +0000
+++ b/broffice.org.postrm.in 2009-10-14 07:48:08 +0000
@@ -5,6 +5,8 @@
THIS_PACKAGE=broffice.org
THIS_SCRIPT=postrm
+#INCLUDE_SHELL_LIB#
+
DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/openoffice....@ver@-calc.desktop
/usr/share/applications/openoffice....@ver@-writer.desktop
/usr/share/applications/openoffice....@ver@-draw.desktop
/usr/share/applications/openoffice....@ver@-base.desktop
/usr/share/applications/openoffice....@ver@-impress.desktop
/usr/share/applications/openoffice....@ver@-math.desktop
/usr/share/applications/openoffice....@ver@-extensionmgr.desktop
/usr/share/applications/openoffice....@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
/usr/share/templates/soffice.odt.desktop
/usr/share/templates/soffice.ods.desktop
/usr/share/templates/soffice.odp.desktop /us
r/share/templates/soffice.odg.desktop"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2009-10-14 07:40:37 +0000
+++ b/broffice.org.preinst.in 2009-10-14 07:48:08 +0000
@@ -5,6 +5,8 @@
THIS_PACKAGE=broffice.org
THIS_SCRIPT=preinst
+#INCLUDE_SHELL_LIB#
+
DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/openoffice....@ver@-calc.desktop
/usr/share/applications/openoffice....@ver@-writer.desktop
/usr/share/applications/openoffice....@ver@-draw.desktop
/usr/share/applications/openoffice....@ver@-base.desktop
/usr/share/applications/openoffice....@ver@-impress.desktop
/usr/share/applications/openoffice....@ver@-math.desktop
/usr/share/applications/openoffice....@ver@-extensionmgr.desktop
/usr/share/applications/openoffice....@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
/usr/share/templates/soffice.odt.desktop
/usr/share/templates/soffice.ods.desktop
/usr/share/templates/soffice.odp.desktop /us
r/share/templates/soffice.odg.desktop"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
=== modified file 'rules'
--- a/rules 2009-10-14 07:00:58 +0000
+++ b/rules 2009-10-14 07:48:08 +0000
@@ -1999,7 +1999,7 @@
echo "" >> $$MAINTSCRIPT; \
if grep -q conffile $$MAINTSCRIPT.in; then \
cat debian/shell-lib-conffiles.sh >> $$MAINTSCRIPT; \
- elif grep -q extension $$MAINTSCRIPT.in; then \
+ elif egrep -q "(add|remove)_extension" $$MAINTSCRIPT.in; then \
echo ". /usr/share/debconf/confmodule" >> $$MAINTSCRIPT; \
echo "" >> $$MAINTSCRIPT; \
cat debian/shell-lib-extensions.sh >> $$MAINTSCRIPT; \
