[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.3-3-219-g54b3028



The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 5943a07f26263584fad01dea3f521b682ddfc0a6
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Wed Oct 26 19:55:55 2011 +0200

    cherrypick disable-test-apply.diff from ubuntu-natty-3.3

diff --git a/patches/disable-test-apply.diff b/patches/disable-test-apply.diff
new file mode 100644
index 0000000..cece8f3
--- /dev/null
+++ b/patches/disable-test-apply.diff
@@ -0,0 +1,11 @@
+--- 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 {
+     my $cmd = "$cmd_base --dry-run $cmd_output";
+
+     print "$cmd\n" unless $quiet;
+-    system ($cmd) && die "Testing patch $patch_file failed.";
++    #system ($cmd) && die "Testing patch $patch_file failed.";
+
+     $cmd = "$cmd_base > /dev/null";
+     if($quiet)
diff --git a/patches/series b/patches/series
index 56316eb..2ba20db 100644
--- a/patches/series
+++ b/patches/series
@@ -29,4 +29,5 @@ ubuntufixes-core.diff
 ubuntufixes-binfilter.diff
 fix-libreoffice-build-configure-in.diff
 apply-ext-human-updates.diff
+disable-test-apply.diff
 update-from-libreoffice-3.4.3.2-to-libreoffice-3.4.4.1.diff

-- 
LibreOffice packaging repository


Reply to: