[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.9.5-30-gc67aa9c

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 286fd6bf6a57e50979f9a6c9e6e12b8dc40fefe4
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Mar 9 13:51:25 2011 +0200

    Add set_command_options routine and pass --parallel via it.
---
 qt-kde-team/2/debian-qt-kde.mk |    8 +++++---
 qt-kde-team/2/dhmk.mk          |    5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/qt-kde-team/2/debian-qt-kde.mk b/qt-kde-team/2/debian-qt-kde.mk
index cde20a9..6a62625 100644
--- a/qt-kde-team/2/debian-qt-kde.mk
+++ b/qt-kde-team/2/debian-qt-kde.mk
@@ -5,12 +5,14 @@ dqk_sourcepkg := $(shell dpkg-parsechangelog | sed -n '/^Source:/{ s/^Source:[[:
 dqk_destdir = $(CURDIR)/debian/tmp
 
 # We want to use kde and pkgkde-symbolshelper plugins by default
-# Moreover, KDE packages are parallel safe
-dh := --with=kde,pkgkde-symbolshelper --parallel $(dh)
+dh := --with=kde,pkgkde-symbolshelper $(dh)
 
 # Include dhmk file
 include $(dqk_dir)dhmk.mk
 
+# KDE packages are parallel safe. Add --parallel to dh_auto_% commands
+$(call set_command_options,dh_auto_%, += --parallel)
+
 # TODO:
 # DEB_KDE_DISABLE_POLICY_CHECK lists distributions for which
 # policy check should be disabled
@@ -23,7 +25,7 @@ include $(dqk_dir)dhmk.mk
 
 # Since cmake 2.6.2 or higher is required from now on, enable relative paths to
 # get more ccache hits.
-configure_dh_auto_configure += "-u-DCMAKE_USE_RELATIVE_PATHS=ON"
+$(call set_command_options,dh_auto_configure, += "-u-DCMAKE_USE_RELATIVE_PATHS=ON")
 
 # Run dh_sameversiondep
 run_dh_sameversiondep:
diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index ec4111a..33dc9f2 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -29,6 +29,11 @@ $(foreach t,$(dhmk_indeparch_targets),$(eval dhmk_$(t)_targets = $(t)-indep $(t)
 $(foreach t,$(filter-out %-arch %-indep,$(dhmk_standard_targets)),\
     $(eval dhmk_$(t)_targets += $(t)))
 
+# A helper routine to set additional command options
+set_command_options = $(foreach t,$(filter $(or $3,%),$(dhmk_standard_targets)),\
+                        $(foreach c,$(filter $1,$(dhmk_$(t)_commands)),\
+                          $(eval $(t)_$(c) $2)))
+
 # $(call butfirstword,TEXT,DELIMITER)
 butfirstword = $(patsubst $(firstword $(subst $2, ,$1))$2%,%,$1)
 

-- 
Debian Qt/KDE packaging tools