./packages/openofficeorg/3.1/experimental r1382: merge
------------------------------------------------------------
revno: 1382
committer: Rene Engelhard <rene@debian.org>
branch nick: 31
timestamp: Wed 2009-01-07 21:09:57 +0100
message:
merge
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
------------------------------------------------------------
revno: 1332.1.35
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-07 03:39:39 +0100
message:
- remove empty .../ure/lib dir in -common
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.36
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-07 21:14:44 +0100
message:
missing /
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2009-01-02 05:09:15 +0000
+++ b/broffice.org.postrm.in 2009-01-07 20:14:44 +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"
+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"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2009-01-02 05:09:15 +0000
+++ b/broffice.org.preinst.in 2009-01-07 20:14:44 +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"
+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"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2009-01-07 02:07:15 +0000
+++ b/changelog 2009-01-07 20:09:57 +0000
@@ -40,6 +40,7 @@
- install libsalalloc_malloc.so.3 into -qa-tools
- remove rest of if(n)eq ETCH_BACKPORT conditionals
- fix extra license/readme file removal
+ - remove empty .../ure/lib dir in -common
* debian/control.reportdesign.in:
- add missing Depends: on ${java-runtime-depends}
* debian/control.in:
@@ -53,7 +54,7 @@
* debian/presubj: point to OpenOffice.orgs README sections
("Problems During Program Startup" and "File Locking").
- -- Rene Engelhard <rene@debian.org> Wed, 07 Jan 2009 02:53:42 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 07 Jan 2009 21:14:24 +0100
openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-07 02:09:34 +0000
+++ b/rules 2009-01-07 20:09:57 +0000
@@ -2740,6 +2740,10 @@
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/README.html
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/README
+ # URE got moved to /usr/lib, so this is obsolete
+ rmdir $(PKGDIR)-common/$(OOBRANDDIR)/ure/lib
+ rmdir $(PKGDIR)-common/$(OOBRANDDIR)/ure
+
# install ooo-build desktop icons
for r in 16x16 22x22 24x24 32x32 48x48; do \
mkdir -p $(PKGDIR)-common/usr/share/icons/hicolor/$$r/apps; \
Reply to: