------------------------------------------------------------
revno: 2046
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2010-07-06 15:07:24 +0200
message:
change new brand.xcd
modified:
broffice.org.postrm.in
broffice.org.preinst.in
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2010-05-26 17:19:24 +0000
+++ b/broffice.org.postrm.in 2010-07-06 13:07:24 +0000
@@ -4,7 +4,7 @@
#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="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/brand.xcd
/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 /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.bmp
/@OOBRANDDIR@/program/about.png"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2010-05-26 17:19:24 +0000
+++ b/broffice.org.preinst.in 2010-07-06 13:07:24 +0000
@@ -4,7 +4,7 @@
#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="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/brand.xcd
/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 /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.bmp
/@OOBRANDDIR@/program/about.png"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'rules'
--- a/rules 2010-07-06 12:30:09 +0000
+++ b/rules 2010-07-06 13:07:24 +0000
@@ -3046,6 +3046,9 @@
cat $(PKGDIR)-common/$(OOBRANDDIR)/program/versionrc \
| sed -e "s/en-US/pt-BR/" | sed -e "s/OpenO/BrO/" \
> debian/broffice.org$(VER)/$(OOBRANDDIR)/program/versionrc
+ cat $(PKGDIR)-common/$(OOBRANDDIR)/share/registry/brand.xcd \
+ | sed -e 's,<prop
oor:name="ooName"><value>OpenOffice.org</value>,<prop
oor:name="ooName"><value>BrOffice.org</value>,' \
+ >
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/brand.xcd
ifeq "$(BUILD_KDE)" "y"
for i in odt ods odp odg; do \
cat $(PKGDIR)-kde/usr/share/templates/soffice.$${i}.desktop \
