[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.3_rc1-1-3-ge3f3ef5

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.6 branch:
commit e3f3ef5f4efd41671c07ae5ec44ac571db2c8059
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Oct 18 10:59:49 2012 +0200

    fix bashism in soffice for valgrinding

diff --git a/changelog b/changelog
index d5a582c..c0663b4 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
 libreoffice (1:3.6.3~rc1-2) UNRELEASED; urgency=low
 
+  * debian/patches/soffice-bashisms.diff: fix bashism in soffice for
+    valgrinding (closes: #690717)
+
   * debian/rules:
     - fix upstream README(_en-US) install for binary-indep packages
 
diff --git a/patches/series b/patches/series
index a62ebc9..6f916b9 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,4 @@ ignore-sc_cellrangesbase-fails.diff
 build-dont-run-checks.diff
 #disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
 disable-flaky-unoapi-tests.diff
+soffice-bashisms.diff
diff --git a/patches/soffice-bashisms.diff b/patches/soffice-bashisms.diff
new file mode 100644
index 0000000..25f041f
--- /dev/null
+++ b/patches/soffice-bashisms.diff
@@ -0,0 +1,13 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index 7727206..0c3ab6d 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -155,7 +155,7 @@ fi
+ # valgrind --log-file=valgrind.log does not work well with --trace-children=yes
+ if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then
+     echo "redirecting the standard and the error output to valgrind.log"
+-    exec &>valgrind.log
++    exec 2>&1 > valgrind.log
+ fi
+ 
+ # oosplash does the rest: forcing pages in, javaldx etc. are

-- 
LibreOffice packaging repository