[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.1-1-14-g642bb23

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.5 branch:
commit 642bb2342cbec8b080ee3f9564f8febe5a20e4fc
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Mar 28 08:28:43 2012 +0200

    readd explicit --with-num-cpus=1 when PARALLEL_BUILD=n

diff --git a/changelog b/changelog
index 9629a91..54eb762 100644
--- a/changelog
+++ b/changelog
@@ -5,10 +5,12 @@ libreoffice (1:3.5.2~rc2-1) UNRELEASED; urgency=low
 
   * debian/rules:
     - make make check failure abort again 
+    - readd apparently lost explicit --with-num-cpus=1 when PARALLEL_BUILD=n,
+      the configure check apparently doesn't prevent us from failing (anymore)
   * debian/rules, debian/uno-libs3.symbols:
     - add ure dependency for stuff linked to uno-libs3, too
 
- -- Rene Engelhard <rene@debian.org>  Tue, 27 Mar 2012 23:03:32 +0200
+ -- Rene Engelhard <rene@frodo.fritz.box>  Wed, 28 Mar 2012 08:18:15 +0200
 
 libreoffice (1:3.5.1-1) experimental; urgency=low
 
diff --git a/rules b/rules
index 7d0db62..09c2d48 100755
--- a/rules
+++ b/rules
@@ -1154,6 +1154,8 @@ ifeq "$(PARALLEL_BUILD)" "y"
   ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
 	CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
   endif
+else
+	CONFIGURE_FLAGS += --with-num-cpus=1
 endif
 
 

-- 
LibreOffice packaging repository