[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_dfsg-2-11-g0908ff4

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

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

    fix bashism in soffice for valgrinding
    
    Conflicts:
    	changelog
    	patches/series

diff --git a/changelog b/changelog
index ebbb164..30f1f7f 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:3.5.4+dfsg-3) unstable; urgency=high
   * debian/patches/ca-XV-update.diff: update ca-XV translations, thanks
     Jordi Mallach
   * debian/patches/CVE-2012-4233.diff: fix CVE-2012-4233.diff/HTB23106 
+  * debian/patches/soffice-bashisms.diff: fix bashism in soffice for
+    valgrinding (closes: #690717)
+
   * debian/rules:
     - exclude .desktop from dh_link call to get absolute symlinks
       (closes: #690336)
diff --git a/patches/series b/patches/series
index 8a759f9..d0f07e3 100644
--- a/patches/series
+++ b/patches/series
@@ -46,3 +46,4 @@ CVE-2012-2665.diff
 CVE-2012-2665-binfilter.diff
 ca-XV-update.diff
 CVE-2012-4233.diff
+soffice-bashisms.diff
diff --git a/patches/soffice-bashisms.diff b/patches/soffice-bashisms.diff
new file mode 100644
index 0000000..d8f1e43
--- /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.in
++++ b/desktop/scripts/soffice.sh.in
+@@ -154,7 +154,7 @@
+ # valgrind --log-file=valgrind.log does not work well with --trace-children=yes
+ if [ -n "$VALGRINDCHECK" ] ; then
+     echo "redirecting the standard and the error output to valgrind.log"
+-    exec &>valgrind.log
++    exec 2>&1 > valgrind.log
+ fi
+ 
+ # do not pass the request for command line help to oosplash

-- 
LibreOffice packaging repository