./packages/openofficeorg/3.0/experimental r1298: fix Setup.xcu diversion
------------------------------------------------------------
revno: 1298
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-10-28 12:54:17 +0100
message:
fix Setup.xcu diversion
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2008-07-30 01:52:28 +0000
+++ b/broffice.org.postrm.in 2008-10-28 11:54:17 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/data/org/openoffice/Setup.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"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/data/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"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2008-07-30 01:52:28 +0000
+++ b/broffice.org.preinst.in 2008-10-28 11:54:17 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/data/org/openoffice/Setup.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"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OODIR@/share/registry/data/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"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2008-10-21 21:26:04 +0000
+++ b/changelog 2008-10-28 11:54:17 +0000
@@ -11,8 +11,10 @@
- add option to run the API tests (cwscheckapi)
- build with java-gcj-compat on ia64 again, at least temporarily
(closes: #502422)
+ * debian/rules, debian/broffice.org.{preinst,postrm}.in: fix Setup.xcu
+ diversion
- -- Rene Engelhard <rene@debian.org> Tue, 21 Oct 2008 23:25:28 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 28 Oct 2008 12:52:56 +0100
openoffice.org (1:3.0.0-3) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-10-21 21:26:04 +0000
+++ b/rules 2008-10-28 11:54:17 +0000
@@ -2517,16 +2517,16 @@
mkdir -p debian/broffice.org$(VER)/usr/share/applications
mkdir -p debian/broffice.org$(VER)/usr/share/application-registry
mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/program/resource
- mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/data/org/openoffice
+ mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup
cat $(PKGDIR)-common/$(OOBRANDDIR)/program/bootstraprc \
| sed -e "s/OpenO/BrO/" | sed -e "s/openo/bro/" \
> debian/broffice.org$(VER)/$(OOBRANDDIR)/program/bootstraprc
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/data/org/openoffice/Setup.xcu \
+ cat $(PKGDIR)-common/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup/Setup-brand.xcu \
| sed -e "s/OpenO/BrO/" \
- > debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup.xcu
+ > debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup/Setup-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 \
Reply to: