------------------------------------------------------------
revno: 1125
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-06-09 19:44:12 +0200
message:
fixup openoffice.applications
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2007-07-26 00:29:49 +0000
+++ b/broffice.org.postrm.in 2008-06-09 17:44:12 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OODIR@/program/bootstraprc /@OODIR@/program/versionrc
/@OODIR@/share/registry/data/org/openoffice/Setup.xcu
/usr/share/applications/[EMAIL PROTECTED]@-calc.desktop
/usr/share/applications/[EMAIL PROTECTED]@-writer.desktop
/usr/share/applications/[EMAIL PROTECTED]@-draw.desktop
/usr/share/applications/[EMAIL PROTECTED]@-base.desktop
/usr/share/applications/[EMAIL PROTECTED]@-impress.desktop
/usr/share/applications/[EMAIL PROTECTED]@-math.desktop
/usr/share/applications/[EMAIL PROTECTED]@-extension.desktop
/usr/share/applications/[EMAIL PROTECTED]@-template.desktop"
+DIVERSIONS="/@OODIR@/program/bootstraprc /@OODIR@/program/versionrc
/@OODIR@/share/registry/data/org/openoffice/Setup.xcu
/usr/share/applications/[EMAIL PROTECTED]@-calc.desktop
/usr/share/applications/[EMAIL PROTECTED]@-writer.desktop
/usr/share/applications/[EMAIL PROTECTED]@-draw.desktop
/usr/share/applications/[EMAIL PROTECTED]@-base.desktop
/usr/share/applications/[EMAIL PROTECTED]@-impress.desktop
/usr/share/applications/[EMAIL PROTECTED]@-math.desktop
/usr/share/applications/[EMAIL PROTECTED]@-extension.desktop
/usr/share/applications/[EMAIL PROTECTED]@-template.desktop
/usr/share/application-registry/openoffice.applications"
DIVERSIONS="$DIVERSIONS /@OODIR@/program/intro.bmp /@OODIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2007-07-26 00:29:49 +0000
+++ b/broffice.org.preinst.in 2008-06-09 17:44:12 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OODIR@/program/bootstraprc /@OODIR@/program/versionrc
/@OODIR@/share/registry/data/org/openoffice/Setup.xcu
/usr/share/applications/[EMAIL PROTECTED]@-calc.desktop
/usr/share/applications/[EMAIL PROTECTED]@-writer.desktop
/usr/share/applications/[EMAIL PROTECTED]@-draw.desktop
/usr/share/applications/[EMAIL PROTECTED]@-base.desktop
/usr/share/applications/[EMAIL PROTECTED]@-impress.desktop
/usr/share/applications/[EMAIL PROTECTED]@-math.desktop
/usr/share/applications/[EMAIL PROTECTED]@-extension.desktop
/usr/share/applications/[EMAIL PROTECTED]@-template.desktop"
+DIVERSIONS="/@OODIR@/program/bootstraprc /@OODIR@/program/versionrc
/@OODIR@/share/registry/data/org/openoffice/Setup.xcu
/usr/share/applications/[EMAIL PROTECTED]@-calc.desktop
/usr/share/applications/[EMAIL PROTECTED]@-writer.desktop
/usr/share/applications/[EMAIL PROTECTED]@-draw.desktop
/usr/share/applications/[EMAIL PROTECTED]@-base.desktop
/usr/share/applications/[EMAIL PROTECTED]@-impress.desktop
/usr/share/applications/[EMAIL PROTECTED]@-math.desktop
/usr/share/applications/[EMAIL PROTECTED]@-extension.desktop
/usr/share/applications/[EMAIL PROTECTED]@-template.desktop
/usr/share/application-registry/openoffice.applications"
DIVERSIONS="$DIVERSIONS /@OODIR@/program/intro.bmp /@OODIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2008-06-09 15:43:20 +0000
+++ b/changelog 2008-06-09 17:44:12 +0000
@@ -11,10 +11,12 @@
* debian/rules:
- install also other resolutions than 48x48 for the ooo-build/desktop
icons, thanks Chris Cheney
+ * debian/rules, debian/broffice.org.*.in:
+ - fixup openoffice.applications (closes: #485437)
* debian/copyright:
- update
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 09 Jun 2008 16:58:22 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 09 Jun 2008 19:41:01 +0200
openoffice.org (1:2.4.1~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-06-07 10:48:18 +0000
+++ b/rules 2008-06-09 17:44:12 +0000
@@ -2311,6 +2311,7 @@
rm -rf debian/broffice.org
mkdir -p debian/broffice.org/usr/bin
mkdir -p debian/broffice.org/usr/share/applications
+ mkdir -p debian/broffice.org/usr/share/application-registry
mkdir -p debian/broffice.org/usr/lib/openoffice/program/resource
mkdir -p
debian/broffice.org/usr/lib/openoffice/share/registry/data/org/openoffice
cat $(PKGDIR)-common/$(OODIR)/program/bootstraprc \
@@ -2339,6 +2340,9 @@
cat $(PKGDIR)-common/usr/share/applications/ooo-template.desktop \
| sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
>
debian/broffice.org/usr/share/applications/ooo-template.desktop
+ cat
$(PKGDIR)-common/usr/share/application-registry/openoffice.applications \
+ | sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
+ >
debian/broffice.org/usr/share/application-registry/openoffice.applications
if dpkg-parsechangelog | grep urgency | grep -q "\~.*m[0123456789]\+";
then \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/dev_nologo_broffice/introabout/intro.bmp \
@@ -2392,8 +2396,11 @@
# install .applications, .keys and .mime
mkdir -p $(PKGDIR)-common/usr/share/application-registry && \
- install -m644
$(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.applications \
- $(PKGDIR)-common/usr/share/application-registry
+ cat $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.applications \
+ | sed -e s/OFFICENAME/ooffice/g \
+ | sed -e s/\%PRODUCTNAME/OpenOffice.org/g \
+ | sed -e 's,command=unopkg,command=/$(OODIR)/program/unopkg,' \
+ >
$(PKGDIR)-common/usr/share/application-registry/openoffice.applications
mkdir -p $(PKGDIR)-common/usr/share/mime/packages && \
mkdir -p $(PKGDIR)-common/usr/share/mime-info && \
install -m644 $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.mime \
