The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 143fb8dbbd6be3276efe5a84900b23338f809d1f
Author: Bjoern Michaelsen <[email protected]>
Date: Wed Oct 26 20:56:01 2011 +0200
update disable-test-apply.diff
diff --git a/patches/disable-test-apply.diff b/patches/disable-test-apply.diff
index cece8f3..f5078d3 100644
--- a/patches/disable-test-apply.diff
+++ b/patches/disable-test-apply.diff
@@ -1,11 +1,18 @@
---- libreoffice-3.3.4.orig/libreoffice-build/patches/apply.pl.in
-+++ libreoffice-3.3.4/libreoffice-build/patches/apply.pl.in
-@@ -95,7 +95,7 @@ sub do_patch {
+Index: workdir/libreoffice-build/patches/apply.pl.in
+===================================================================
+--- workdir.orig/libreoffice-build/patches/apply.pl.in 2011-10-26
21:04:53.388732635 +0200
++++ workdir/libreoffice-build/patches/apply.pl.in 2011-10-26
21:08:26.928735549 +0200
+@@ -94,10 +94,10 @@
+
my $cmd = "$cmd_base --dry-run $cmd_output";
-
- print "$cmd\n" unless $quiet;
+
+- print "$cmd\n" unless $quiet;
- system ($cmd) && die "Testing patch $patch_file failed.";
++ #print "$cmd\n" unless $quiet;
+ #system ($cmd) && die "Testing patch $patch_file failed.";
-
- $cmd = "$cmd_base > /dev/null";
+
+- $cmd = "$cmd_base > /dev/null";
++ $cmd = "$cmd_base --merge";
if($quiet)
+ { print "applying..." }
+ else
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
