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

[Modestas Vainius]

The following commit has been merged in the dhmk branch:
commit bdb54d46963e035210f536aec6c9690322ed9d73
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Mar 9 02:24:51 2011 +0200

    Strip dhmk_ prefix from the names of public targets-hooks.
    
    This includes {pre,post}_{action}_{dh_command} and {pre,post}_{action}
    targets-hooks.
---
 qt-kde-team/2/README  |   18 +++++++++---------
 qt-kde-team/2/dhmk.mk |   12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/qt-kde-team/2/README b/qt-kde-team/2/README
index 9b4387f..29648de 100644
--- a/qt-kde-team/2/README
+++ b/qt-kde-team/2/README
@@ -47,19 +47,19 @@ Extending dhmk with makefile snippets (templating recommendations)
 dhmk sequences can be extented by include'ing additional makefile snippets in
 debian/rules.
 
-1) Snippets may hook to the dhmk_pre_{action}_{dh_command} target in order to
-do additional work *before* dh_command runs at the specific action.
+1) Snippets may hook to the pre_{action}_{dh_command} target in order to do
+additional work *before* dh_command runs at the specific action.
 
-2) Snippets may hook to the dhmk_pre_{action}_{dh_command} target in order to
-do additional work *after* dh_command runs at the specific action.
+2) Snippets may hook to the pre_{action}_{dh_command} target in order to do
+additional work *after* dh_command runs at the specific action.
 
-3) Snippets may hook to the dhmk_pre_{action} target in order to do additional
-work at the beginning of the specific action sequence.
+3) Snippets may hook to the pre_{action} target in order to do additional work
+at the beginning of the specific action sequence.
 
-4) Snippets may hook to the dhmk_post_{action} target in order to do additional
-work at the end of the specific action sequence.
+4) Snippets may hook to the post_{action} target in order to do additional work
+at the end of the specific action sequence.
 
-5) Snippets may alter the contents of the "{target}_{dh_command}" variable in
+5) Snippets may alter the contents of the "{action}_{dh_command}" variable in
 order to change command line (including the command itself) of the specified
 dh_command whenever it runs during the specified action. Snippets should
 preferably NOT use override_{dh_command} targets.
diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index 5f496e4..01f77e0 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -57,10 +57,10 @@ include $(shell test ! -f $(dhmk_rules_mk) && touch -t 197001030000 $(dhmk_rules
 dhmk_override_cmd = $(if $(dhmk_$1),$(MAKE) -f $(dhmk_top_makefile) $1)
 dhmk_run_command = $(or $(call dhmk_override_cmd,override_$(call butfirstword,$1,_)),$($1) $(DHMK_OPTIONS))
 
-# 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_%:
+# Generate {pre,post}_{target}_{command} targets for each target+command
+$(foreach t,$(dhmk_standard_targets),$(foreach c,$(dhmk_$(t)_commands),pre_$(t)_$(c))): pre_%:
 	$(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_%:
+$(foreach t,$(dhmk_standard_targets),$(foreach c,$(dhmk_$(t)_commands),post_$(t)_$(c))): post_%:
 
 # Export -a/-i options for indep/arch specific targets
 $(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-indep): export DH_INTERNAL_OPTIONS := -i
@@ -79,8 +79,8 @@ $(foreach t,$(dhmk_standard_targets),debian/dhmk_$(t)): debian/dhmk_%:
 	# "$*" is complete
 
 .PHONY: $(foreach t,$(dhmk_standard_targets),dhmk_run_$(t)_commands \
-    dhmk_pre_$(t) dhmk_post_$(t) \
-    $(foreach c,$(dhmk_$(t)_commands),dhmk_pre_$(t)_$(c) dhmk_post_$(t)_$(c)))
+    pre_$(t) post_$(t) \
+    $(foreach c,$(dhmk_$(t)_commands),pre_$(t)_$(c) post_$(t)_$(c)))
 
 # Implicitly delegate other targets to debian/dhmk_% ones. Hence the top
 # targets (build, configure, install ...) are still cancellable.
@@ -93,7 +93,7 @@ $(foreach t,$(dhmk_standard_targets),debian/dhmk_$(t)): debian/dhmk_%:
 $(foreach t,$(dhmk_standard_targets),debian/dhmk_$(t)): debian/dhmk_%: $$(foreach d,$$(dhmk_%_depends),debian/dhmk_$$d)
 
 # Generate command chains for the standard targets
-$(foreach t,$(dhmk_standard_targets),dhmk_run_$(t)_commands): dhmk_run_%_commands: dhmk_pre_% $$(foreach c,$$(dhmk_%_commands),dhmk_pre_%_$$(c) dhmk_post_%_$$(c)) dhmk_post_%
+$(foreach t,$(dhmk_standard_targets),dhmk_run_$(t)_commands): dhmk_run_%_commands: pre_% $$(foreach c,$$(dhmk_%_commands),pre_%_$$(c) post_%_$$(c)) post_%
 
 endif # ifeq (dhmk_override_info_mode,yes)
 

-- 
Debian Qt/KDE packaging tools