./packages/openofficeorg/3.1/unstable r1625: merge
------------------------------------------------------------
revno: 1625 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2009-08-02 17:31:21 +0200
message:
merge
modified:
broffice.org.postrm.in
broffice.org.preinst.in
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2009-05-08 22:01:24 +0000
+++ b/broffice.org.postrm.in 2009-08-02 15:29:33 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/ooo@VER@-calc.desktop /usr/share/applications/ooo@VER@-writer.desktop /usr/share/applications/ooo@VER@-draw.desktop /usr/share/applications/ooo@VER@-base.desktop /usr/share/applications/ooo@VER@-impress.desktop /usr/share/applications/ooo@VER@-math.desktop /usr/share/applications/ooo@VER@-extensionmgr.desktop /usr/share/applications/ooo@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 /usr/share/templates/soffice.odg.desktop"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/openoffice.org@VER@-calc.desktop /usr/share/applications/openoffice.org@VER@-writer.desktop /usr/share/applications/openoffice.org@VER@-draw.desktop /usr/share/applications/openoffice.org@VER@-base.desktop /usr/share/applications/openoffice.org@VER@-impress.desktop /usr/share/applications/openoffice.org@VER@-math.desktop /usr/share/applications/openoffice.org@VER@-extensionmgr.desktop /usr/share/applications/openoffice.org@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"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2009-05-08 22:01:24 +0000
+++ b/broffice.org.preinst.in 2009-08-02 15:29:33 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/ooo@VER@-calc.desktop /usr/share/applications/ooo@VER@-writer.desktop /usr/share/applications/ooo@VER@-draw.desktop /usr/share/applications/ooo@VER@-base.desktop /usr/share/applications/ooo@VER@-impress.desktop /usr/share/applications/ooo@VER@-math.desktop /usr/share/applications/ooo@VER@-extensionmgr.desktop /usr/share/applications/ooo@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 /usr/share/templates/soffice.odg.desktop"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/openoffice.org@VER@-calc.desktop /usr/share/applications/openoffice.org@VER@-writer.desktop /usr/share/applications/openoffice.org@VER@-draw.desktop /usr/share/applications/openoffice.org@VER@-base.desktop /usr/share/applications/openoffice.org@VER@-impress.desktop /usr/share/applications/openoffice.org@VER@-math.desktop /usr/share/applications/openoffice.org@VER@-extensionmgr.desktop /usr/share/applications/openoffice.org@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"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'rules'
--- a/rules 2009-08-01 20:38:24 +0000
+++ b/rules 2009-08-02 15:31:21 +0000
@@ -2269,9 +2269,11 @@
for i in base calc draw impress math writer; do \
cat debian/openoffice.org$(VER)-$$i.menu.in \
| sed -e s/@ICONVERSION@/$$ICONVERSION/ \
+ | sed -e s/@VER/$(VER)/ \
> debian/openoffice.org$(VER)-$$i.menu; \
cat debian/openoffice.org$(VER)-$$i.lintian-overrides.in \
| sed -e s/@ICONVERSION@/$$ICONVERSION/ \
+ | sed -e s/@VER@/$(VER)/ \
> debian/openoffice.org$(VER)-$$i.lintian-overrides; \
done
Reply to: