[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8-2-88-gc86df81

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit 5cac70360f16dd70657ed8021153af4af1a84f24
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Mon Apr 19 23:47:41 2010 +0200

    remove parallel build sopport again

diff --git a/debian/changelog b/debian/changelog
index 17dbf50..05257e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wesnoth-1.8 (1:1.8-3) unstable; urgency=low
+
+  * Remove parallel build support again, it's dysfunctional and proper support
+    would require major debian/rules rewrite.
+
+ -- 
+
 wesnoth-1.8 (1:1.8-2) unstable; urgency=low
 
   * Support for DEB_BUILD_OPTIONS="parallel=X" added, thanks to prodding by
diff --git a/debian/rules b/debian/rules
index dc58fbd..dc7fffe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,11 @@ ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 else
         CFLAGS += -O2
 endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
+## disabled for the time being again - debian/rules need to get rewritten
+## ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+## 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+## 	MAKEFLAGS += -j$(NUMJOBS)
+## endif
 
 
 # calculate the version strings

-- 
Debian packaging of wesnoth