------------------------------------------------------------
revno: 2169
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2010-11-02 02:55:54 +0100
message:
remove versionrc diversions
modified:
broffice.org.postinst.in
broffice.org.postrm.in
broffice.org.preinst.in
changelog
=== modified file 'broffice.org.postinst.in'
--- a/broffice.org.postinst.in 2010-10-22 13:44:41 +0000
+++ b/broffice.org.postinst.in 2010-11-02 01:55:54 +0000
@@ -11,6 +11,7 @@
if [ -n "$2" ]; then
if dpkg --compare-versions $2 lt 1:3.3.0~beta3; then
dpkg-divert --package $THIS_PACKAGE --remove --rename
--divert /@OOBRANDDIR@/program/intro.bmp.ooo /@OOBRANDDIR@/program/intro.bmp
+ dpkg-divert --package $THIS_PACKAGE --remove --rename
--divert /@OOBRANDDIR@/program/versionrc.ooo /@OOBRANDDIR@/program/versionrc
for i in $LANGPACKISOS; do
dpkg-divert --package $THIS_PACKAG --remove
--rename --divert /@OOBRANDDIR@/program/resource/ooo$i.res.ooo
/@OOBRANDDIR@/program/resource/ooo$i.res
done
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2010-10-22 13:44:41 +0000
+++ b/broffice.org.postrm.in 2010-11-02 01:55:54 +0000
@@ -4,7 +4,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/brand.xcd
/usr/share/applications/libreoff...@ver@-calc.desktop
/usr/share/applications/libreoff...@ver@-writer.desktop
/usr/share/applications/libreoff...@ver@-draw.desktop
/usr/share/applications/libreoff...@ver@-base.desktop
/usr/share/applications/libreoff...@ver@-impress.desktop
/usr/share/applications/libreoff...@ver@-math.desktop
/usr/share/applications/libreoff...@ver@-extensionmgr.desktop
/usr/share/applications/libreoff...@ver@-startcenter.desktop
/usr/share/applications/libreoff...@ver@-javafilter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys /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@/share/registry/brand.xcd
/usr/share/applications/libreoff...@ver@-calc.desktop
/usr/share/applications/libreoff...@ver@-writer.desktop
/usr/share/applications/libreoff...@ver@-draw.desktop
/usr/share/applications/libreoff...@ver@-base.desktop
/usr/share/applications/libreoff...@ver@-impress.desktop
/usr/share/applications/libreoff...@ver@-math.desktop
/usr/share/applications/libreoff...@ver@-extensionmgr.desktop
/usr/share/applications/libreoff...@ver@-startcenter.desktop
/usr/share/applications/libreoff...@ver@-javafilter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys /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="$DIVERSIONS /@OOBRANDDIR@/program/intro.png
/@OOBRANDDIR@/program/about.png"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2010-10-22 13:44:41 +0000
+++ b/broffice.org.preinst.in 2010-11-02 01:55:54 +0000
@@ -4,7 +4,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/brand.xcd
/usr/share/applications/libreoff...@ver@-calc.desktop
/usr/share/applications/libreoff...@ver@-writer.desktop
/usr/share/applications/libreoff...@ver@-draw.desktop
/usr/share/applications/libreoff...@ver@-base.desktop
/usr/share/applications/libreoff...@ver@-impress.desktop
/usr/share/applications/libreoff...@ver@-math.desktop
/usr/share/applications/libreoff...@ver@-extensionmgr.desktop
/usr/share/applications/libreoff...@ver@-startcenter.desktop
/usr/share/applications/libreoff...@ver@-javafilter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys /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@/share/registry/brand.xcd
/usr/share/applications/libreoff...@ver@-calc.desktop
/usr/share/applications/libreoff...@ver@-writer.desktop
/usr/share/applications/libreoff...@ver@-draw.desktop
/usr/share/applications/libreoff...@ver@-base.desktop
/usr/share/applications/libreoff...@ver@-impress.desktop
/usr/share/applications/libreoff...@ver@-math.desktop
/usr/share/applications/libreoff...@ver@-extensionmgr.desktop
/usr/share/applications/libreoff...@ver@-startcenter.desktop
/usr/share/applications/libreoff...@ver@-javafilter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys /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="$DIVERSIONS /@OOBRANDDIR@/program/intro.png
/@OOBRANDDIR@/program/about.png"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2010-11-01 22:27:15 +0000
+++ b/changelog 2010-11-02 01:55:54 +0000
@@ -20,10 +20,10 @@
- remove manual installing of LibO splash (LibO now also supports
intro.png)
- update .desktop file/icon installation to actually give sensible results
(Exec= and Icon=; fix up broffice.org changes)
- - stop trying to change the product name in ooo*.res; apparently is not
- needed anymore (and doing so breaks BrOffice.org About)
+ - stop trying to change the product name in ooo*.res and versionrc;
apparently
+ it is not needed anymore (and doing so breaks BrOffice.org About)
* debian/broffice.org.p*.in: adapt diversions for new intro.png;
- remove ooo*.res diversions
+ remove ooo*.res/versionrc diversions
* debian/soffice-template.desktop.in: update for LibreOffice and ..
* debian/templates/soffice-template.desktop.in: ... here
* debian/templates/debian-presentation*: add Debian presentation template,
