[SCM] Debian Qt/KDE packaging tools branch, dhmk, updated. debian/0.9.5-15-g8a9f2f7

[Modestas Vainius]

The following commit has been merged in the dhmk branch:
commit 8c3fac12dc0200c740b8b8f54501bf1e617f5ae5
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Mar 8 02:38:34 2011 +0200

    Pass -i/-a options via DH_INTERNAL_OPTIONS.
    
    debhelper programs give DH_INTERNAL_OPTIONS special treatment, e.g. like
    additional filters for -p that are passed via command line.
---
 qt-kde-team/2/dhmk.mk |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index 5ffa6f0..518dcdf 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -55,12 +55,12 @@ dhmk_run_command = $(or $(call dhmk_override_cmd,override_$(call butfirstword,$1
 
 # Generate dhmk_{pre,post}_{target}_{command} targets for each target+command
 $(foreach t,$(dhmk_standard_targets),$(foreach c,$(dhmk_$(t)_commands),dhmk_pre_$(t)_$(c))): dhmk_pre_%:
-	$(call dhmk_run_command,$*)
+	$(call dhmk_run_command,$*) # $(and $(DH_INTERNAL_OPTIONS),[$(DH_INTERNAL_OPTIONS)])
 $(foreach t,$(dhmk_standard_targets),$(foreach c,$(dhmk_$(t)_commands),dhmk_post_$(t)_$(c))): dhmk_post_%:
 
 # Export -a/-i options for indep/arch specific targets
-$(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-indep): export DH_OPTIONS = -i
-$(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-arch): export DH_OPTIONS = -a
+$(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-indep): export DH_INTERNAL_OPTIONS := -i
+$(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-arch):  export DH_INTERNAL_OPTIONS := -a
 
 # Mark dynamic standard targets as PHONY
 .PHONY: $(foreach t,$(dhmk_dynamic_targets),debian/dhmk_$(t))
@@ -68,7 +68,6 @@ $(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-arch): export DH_OPTIONS
 # Create debian/dhmk_{action} targets.
 # NOTE: dhmk_run_{target}_commands are defined below
 $(foreach t,$(dhmk_standard_targets),debian/dhmk_$(t)): debian/dhmk_%:
-	$(if $(DH_OPTIONS),#### NOTE: DH_OPTIONS is set to $(DH_OPTIONS) ####)
 	$(MAKE) -f $(dhmk_top_makefile) dhmk_run_$*_commands
 	$(if $(filter $*,$(dhmk_stamped_targets)),touch $@)
 	$(if $(filter clean,$*),rm -f $(dhmk_rules_mk)\

-- 
Debian Qt/KDE packaging tools