[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-1-3-gc5d5640
The following commit has been merged in the master branch:
commit c5d564088835604b78819e75b788358e8374aef5
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 31 19:13:38 2011 +0200
debian/patches/no-deprecated-options-in-qstart-wrappers.diff: use --writer instead of -writer (closes: #638868)
diff --git a/changelog b/changelog
index 34b83ba..8fba673 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
+
+ * debian/patches/no-deprecated-options-in-qstart-wrappers.diff: use --writer
+ instead of -writer (closes: #638868)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 31 Aug 2011 19:12:01 +0200
+
libreoffice (1:3.4.3-1) unstable; urgency=low
* New upstream release
diff --git a/patches/no-deprecated-options-in-qstart-wrappers.diff b/patches/no-deprecated-options-in-qstart-wrappers.diff
new file mode 100644
index 0000000..bb791f4
--- /dev/null
+++ b/patches/no-deprecated-options-in-qstart-wrappers.diff
@@ -0,0 +1,14 @@
+--- libreoffice-3.4.3/libreoffice-build/bin/package-ooo.old 2011-08-31 19:09:00.000000000 +0200
++++ libreoffice-3.4.3/libreoffice-build/bin/package-ooo 2011-08-31 19:10:24.000000000 +0200
+@@ -77,9 +77,9 @@
+
+ # startup wrappers
+ for app in calc draw impress math web writer base; do
+- create_qstart_wrapper "$PREFIX/bin/lo${app}${BINSUFFIX}" "-${app}" || exit 1;
++ create_qstart_wrapper "$PREFIX/bin/lo${app}${BINSUFFIX}" "--${app}" || exit 1;
+ if test "$COMPAT_OOWRAPPERS" = "YES" ; then
+- create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" || exit 1;
++ create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "--${app}" || exit 1;
+ fi
+ done
+ create_qstart_wrapper "$PREFIX/bin/lofromtemplate${BINSUFFIX}" ".uno:NewDoc" || exit 1;
diff --git a/patches/series b/patches/series
index bf3a07f..f3ca361 100644
--- a/patches/series
+++ b/patches/series
@@ -22,3 +22,4 @@ fix-distro-config.diff
#sdbc-postgresql-obsolete-hash-map.diff
mipsel-jfw-plugin-arch.diff
oosplash-javaldx-path.diff
+no-deprecated-options-in-qstart-wrappers.diff
--
LibreOffice packaging repository
Reply to: