The following commit has been merged in the debian-experimental-3.5 branch:
commit c7a476b645fb2a2c0f66be3bd981d4fadd8fa2a6
Author: Rene Engelhard <r...@debian.org>
Date: Thu Oct 18 10:59:49 2012 +0200
fix bashism in soffice for valgrinding
diff --git a/changelog b/changelog
index c81f5f6..7e3f05b 100644
--- a/changelog
+++ b/changelog
@@ -2,9 +2,11 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
* new upstream release
- caches fontconfig font substitutions (closes: #681308)
-
+
* debian/patches/ca-XV-update.diff: update ca-XV translations, thanks
Jordi Mallach
+ * debian/patches/soffice-bashisms.diff: fix bashism in soffice for
+ valgrinding (closes: #690717)
* debian/rules:
- use generic python3.pc instead of pythonX.Y(mu).pc
@@ -14,7 +16,7 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
* debian/control.in:
- remove obsolete sharutils, po-debconf and wget | curl build-deps
- -- Rene Engelhard <r...@debian.org> Wed, 17 Oct 2012 16:23:01 +0200
+ -- Rene Engelhard <r...@debian.org> Fri, 19 Oct 2012 10:52:12 +0200
libreoffice (1:3.5.4+dfsg-2) unstable; urgency=low
diff --git a/patches/series b/patches/series
index 6d5f957..47a7c93 100644
--- a/patches/series
+++ b/patches/series
@@ -34,3 +34,4 @@ ignore-sc_cellrangesbase-fails.diff
fix-Test-BigPtrArray-on-64bit-bigendian.diff
CVE-2012-2665-binfilter.diff
ca-XV-update.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
--
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/e1tp8sk-0007vf...@vasks.debian.org
