------------------------------------------------------------
revno: 1885
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Thu 2010-03-25 00:03:48 +0100
message:
don't use deprecated slot:5500 in oofromtemplate
added:
patches/oofromtemplate-no-deprecated-slot.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-03-24 18:40:54 +0000
+++ b/changelog 2010-03-24 23:03:48 +0000
@@ -14,6 +14,8 @@
* debian/patches/cws-linuxaxp01.diff: add alpha port from issue 110145
* debian/patches/redland-remove-patches.diff: remove redland patches
allowing to use system-redland (from issue 108911)
+ * debian/patches/oofromtemplate-no-deprecated-slot.diff: don't use
+ deprecated slot:5500 in oofromtemplate
* debian/rules:
- re-enable system-mysqlcppconn (also in the STLport case); handle
MYSQLC_STATUS suffix in version.mk
=== added file 'patches/oofromtemplate-no-deprecated-slot.diff'
--- a/patches/oofromtemplate-no-deprecated-slot.diff 1970-01-01 00:00:00
+0000
+++ b/patches/oofromtemplate-no-deprecated-slot.diff 2010-03-24 23:03:48
+0000
@@ -0,0 +1,13 @@
+diff --git a/bin/package-ooo b/bin/package-ooo
+index 50ceaf1..7c4b082 100755
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/package-ooo
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/bin/package-ooo
+@@ -83,7 +83,7 @@ mkdir -p $MANDIR/man1
+ for app in calc draw impress math web writer base; do
+ create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" ||
exit 1;
+ done
+-create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "slot:5500" ||
exit 1;
++create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" ".uno:NewDoc"
|| exit 1;
+ create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" || exit 1;
+ create_unopkg_wrapper "$PREFIX/bin/unopkg${BINSUFFIX}" "" || exit 1;
+ if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
=== modified file 'patches/series'
--- a/patches/series 2010-03-24 09:02:02 +0000
+++ b/patches/series 2010-03-24 23:03:48 +0000
@@ -2,3 +2,4 @@
system-mysqlcpp.diff
cws-linuxaxp01.diff
redland-remove-patches.diff
+oofromtemplate-no-deprecated-slot.diff
