------------------------------------------------------------
revno: 1361
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2009-01-02 06:09:15 +0100
message:
also change UI-brand.xcu for BrOffice.org
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2008-12-18 00:04:32 +0000
+++ b/broffice.org.postrm.in 2009-01-02 05:09:15 +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/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@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"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2008-12-18 00:04:32 +0000
+++ b/broffice.org.preinst.in 2009-01-02 05:09:15 +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/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@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"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2008-12-28 00:46:58 +0000
+++ b/changelog 2009-01-02 05:09:15 +0000
@@ -14,8 +14,10 @@
* debian/rules, control.gcj.in: disable ppc for -gcj as gij doesn't work
there anyway (#478760). Fix Architecture: of -gcj to not include
non-Java archs.
+ * debian/rules, debian/broffice.org.{preinst,postrm}.in: also change
+ UI-brand.xcu for BrOffice.org
- -- Rene Engelhard <r...@debian.org> Sun, 28 Dec 2008 01:36:01 +0100
+ -- Rene Engelhard <r...@debian.org> Fri, 02 Jan 2009 06:08:18 +0100
openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-12-28 00:46:58 +0000
+++ b/rules 2009-01-02 05:09:15 +0000
@@ -2531,6 +2531,7 @@
mkdir -p debian/broffice.org$(VER)/usr/share/mimelnk/application
mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/program/resource
mkdir -p
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup
+ mkdir -p
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Office/UI
cat $(PKGDIR)-common/$(OOBRANDDIR)/program/bootstraprc \
| sed -e "s/OpenO/BrO/" | sed -e "s/openo/bro/" \
> debian/broffice.org$(VER)/$(OOBRANDDIR)/program/bootstraprc
@@ -2540,6 +2541,9 @@
cat
$(PKGDIR)-common/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
\
| sed -e "s/OpenO/BrO/" \
>
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
+ cat
$(PKGDIR)-common/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
\
+ | sed -e "s/OpenO/BrO/" \
+ >
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
for iso in $(LANGPACKISOS); do \
if [ "$$iso" = "en-US" ]; then p=common; else p=l10n-`echo
$$iso | tr A-Z a-z`; fi; \
if [ -f
$(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res ]; then \
