------------------------------------------------------------
revno: 766
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2007-06-28 15:41:26 +0200
message:
change ooo-template.desktop for BrOffice.org; add pps to
openoffice.org-impress.mime
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
openoffice.org-impress.mime
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2007-05-13 20:52:13 +0000
+++ b/broffice.org.postrm.in 2007-06-28 13:41:26 +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
/@OODIR@/program/intro.bmp /@OODIR@/program/about.bmp"
+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
/@OODIR@/program/intro.bmp /@OODIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2007-05-13 20:52:13 +0000
+++ b/broffice.org.preinst.in 2007-06-28 13:41:26 +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
/@OODIR@/program/intro.bmp /@OODIR@/program/about.bmp"
+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
/@OODIR@/program/intro.bmp /@OODIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2007-06-28 09:42:00 +0000
+++ b/changelog 2007-06-28 13:41:26 +0000
@@ -16,8 +16,13 @@
- add (Build-)Conflicts against libcairo2 (= 1.4.8-1) (closes: #430135),
cairo 1.4.10 is fixed
- install xmerge javadoc into -dev-doc
+ - change ooo-template.desktop also for BrOffice.org
+ * debian/broffice.org*.in:
+ - add diversion for ooo-template.desktop
+ * debian/openoffice.org-impress.mime:
+ - add pps
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 28 Jun 2007 11:41:38 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 28 Jun 2007 15:36:56 +0200
openoffice.org (2.2.1-2) unstable; urgency=low
=== modified file 'openoffice.org-impress.mime'
--- a/openoffice.org-impress.mime 2006-11-01 21:56:26 +0000
+++ b/openoffice.org-impress.mime 2007-06-28 13:41:26 +0000
@@ -6,3 +6,7 @@
application/mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft
PowerPoint Document"; priority=3
application/vnd.ms-powerpoint; soffice -impress '%s'; edit=soffice -impress
'%s'; test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft
PowerPoint Document"; priority=3
application/x-mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft
PowerPoint Document"; priority=3
+application/mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft
PowerPoint Document"; priority=3
+application/vnd.ms-powerpoint; soffice -impress '%s'; edit=soffice -impress
'%s'; test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft
PowerPoint Document"; priority=3
+application/x-mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft
PowerPoint Document"; priority=3
+
=== modified file 'rules'
--- a/rules 2007-06-28 10:29:35 +0000
+++ b/rules 2007-06-28 13:41:26 +0000
@@ -1943,6 +1943,9 @@
cat $(PKGDIR)-common/usr/share/applications/ooo-extension.desktop \
| sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
>
debian/broffice.org/usr/share/applications/ooo-extension.desktop
+ 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
install -m644 debian/brintro.bmp \
debian/broffice.org/$(OODIR)/program/intro.bmp
install -m644 debian/brabout.bmp \
