[SCM] csound/master: Let CDBS resolve if parallel build is enabled.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 86c8effd9a58c4390704a67aa64a805a8eb456c4
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jan 12 13:06:49 2011 +0100

    Let CDBS resolve if parallel build is enabled.

diff --git a/debian/rules b/debian/rules
index a60119a..77d4e5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,13 +137,8 @@ PYLIBPATH = usr/lib/$(cdbs_python_current_binary)/$(if $(call cdbs_streq,$(cdbs_
 CC = $(DEB_HOST_GNU_TYPE)-gcc
 CXX = $(DEB_HOST_GNU_TYPE)-g++
 
-# Enable parallel building
-ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
-    PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
-        sed -e 's/.*parallel=\([0-9]\+\).*/\1/')
-NJOBS := -j$(PARALLEL_JOBS)
-endif
-
+# Support parallel building if enabled in DEB_BUILD_OPTIONS
+NJOBS = $(DEB_PARALLEL_JOBS:%=-j%)
 
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 

-- 
csound packaging