The following commit has been merged in the debian-experimental-3.6 branch:
commit 8202fc26ffe90147de8a0644191fcdc31111b471
Merge: 23ead2146328d63b50a9e6cfb691089d3fe8d5a9
e526b90165f1fb6c368b6ed54e06182947449d67
Author: Rene Engelhard <r...@debian.org>
Date: Fri Oct 19 12:15:26 2012 +0200
Merge remote-tracking branch 'origin/debian-experimental-3.5' into
debian-experimental-3.6
diff --combined patches/soffice-bashisms.diff
index 25f041f,b69df18..53ec60c
--- a/patches/soffice-bashisms.diff
+++ b/patches/soffice-bashisms.diff
@@@ -1,13 -1,13 +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 @@
+--- 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" ] ; then
+ 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
+ + exec > valgrind.log 2>&1
fi
- # do not pass the request for command line help to oosplash
+ # oosplash does the rest: forcing pages in, javaldx etc. are
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tp9ax-0006g7...@vasks.debian.org
