[SCM] Packaging for scorched3d branch, master, updated. debian/43.2a.dfsg-3-1-ge9e2747

[Bruno Kleinert]

The following commit has been merged in the master branch:
commit e9e2747f472813f8fb79914c45313f3bbee35bed
Author: Bruno Kleinert <fuddl at tauware.de>
Date:   Fri Jun 3 22:58:23 2011 +0200

    Re-enable parallel builds in debian/rules

diff --git a/debian/changelog b/debian/changelog
index 2087d08..f705733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scorched3d (43.2a.dfsg-4) unstable; urgency=low
+
+  * Team upload
+  * Fix broken parallel builds in debian/rules
+
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 03 Jun 2011 22:31:10 +0200
+
 scorched3d (43.2a.dfsg-3) unstable; urgency=low
 
   * Team upload
diff --git a/debian/rules b/debian/rules
index bd73657..dab3c4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+%:
+	dh $@
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -24,14 +32,15 @@ confflags += --infodir=\$${prefix}/share/info
 CFLAGS += -Wall
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	$(info Disable all  optimisations)
-	CFLAGS += -O0
+$(info Disable all  optimisations)
+  CFLAGS += -O0
 else
-	CFLAGS += -O2
+  CFLAGS += -O2
 endif
 
-%:
-	dh $@
+# We want parallel builds (dh_build always does -j1)
+override_dh_auto_build:
+	$(MAKE)
 
 override_dh_auto_configure:
 	# Upstream ships non-DFSG icons, so we replace them

-- 
Packaging for scorched3d