[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc1-1-259-gc6ddb3f
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 739932cef4d9c3258f25c90fca8742f6544f4a68
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Mar 26 18:09:39 2013 +0100
limit jobs for subsequent checks to 1 and reenable heisenbugged tests
diff --git a/changelog b/changelog
index 74f5375..2d65e30 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa1) raring; urgency=low
- * Merge from Debian
+ * merge from Debian
+ * limit jobs for subsequent checks to 1 and reenable heisenbugged tests
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 26 Mar 2013 16:29:26 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 26 Mar 2013 18:08:13 +0100
libreoffice (1:4.0.2~rc2-1) UNRELEASED; urgency=low
diff --git a/patches/series b/patches/series
index 341adf8..49b169e 100644
--- a/patches/series
+++ b/patches/series
@@ -31,5 +31,3 @@ wheezy-backports-python.diff
fix-internal-hsqldb-build.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
lp-780399-sessioninstaller-for-remaining-java-wizards.diff
-fdo-35663.diff
-fdo-61896.diff
diff --git a/rules b/rules
index 6cb5656..8658984 100755
--- a/rules
+++ b/rules
@@ -1304,6 +1304,8 @@ ifeq "$(PARALLEL_BUILD)" "y"
else
CONFIGURE_FLAGS += --without-parallelism
endif
+# disable parallelism for subsequentchecks, there seem to be race conditions still
+CONFIGURE_FLAGS += --with-check-jobs=1
ifeq ($(GCC_VERSION),)
--
LibreOffice packaging repository
Reply to: