[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3, updated. libreoffice_3.3.3-1-125-gdeb5a66
The following commit has been merged in the ubuntu-natty-3.3 branch:
commit deb5a66b9633aec9b74f9355cf68788a94ddfb3f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Sep 13 15:38:03 2011 +0200
disable test patching
diff --git a/changelog b/changelog
index a848bda..8c48782 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,11 @@
libreoffice (1:3.3.4-0ubuntu1) natty-proposed; urgency=low
- * new upstream release
+ * new upstream release (keeping the old tarball, only using patches)
* decoupling from debian, because we dont want to introduce new deps
on natty anymore
+ * disable test apply of patches -- do or fail (to allow git exported
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 09 Sep 2011 19:00:32 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 13 Sep 2011 15:35:56 +0200
libreoffice (1:3.3.3-1ubuntu2) natty-proposed; urgency=medium
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 780280f..19f8e51 100644
--- a/patches/series
+++ b/patches/series
@@ -18,4 +18,5 @@ disable-integrated-ubuntupatches.diff
fix-jpeg.diff
lp720716.diff
lp746375.diff
-patches/update-from-libreoffice-3.3.3.1-to-libreoffice-3.3.4.1.diff
+update-from-libreoffice-3.3.3.1-to-libreoffice-3.3.4.1.diff
+disable-test-apply.diff
--
LibreOffice packaging repository
Reply to: