[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.11.0

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 7b510931023b1b8811ca0fec1446efec77f1bf42
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Mar 10 23:51:01 2011 +0200

    Properly support --remaining-packages in the override targets.
    
    Now --remaining-packages should work as expected in the override targets even
    on the 2nd rerun (without clean). However, this fix depends on the change
    available since debhelper 8.1.1.
---
 qt-kde-team/2/TODO    |    1 -
 qt-kde-team/2/dhmk.mk |   11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/qt-kde-team/2/TODO b/qt-kde-team/2/TODO
deleted file mode 100644
index acc0958..0000000
--- a/qt-kde-team/2/TODO
+++ /dev/null
@@ -1 +0,0 @@
-* --remaining-packages on the second and subsequent reruns (without clean)
diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index ea86374..2d64d06 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -65,8 +65,17 @@ $(dhmk_rules_mk): $(MAKEFILE_LIST) $(dhmk_dhmk_pl)
 # Create an out-of-date rules file if it does not exist. Avoids make warning
 include $(shell test ! -f $(dhmk_rules_mk) && touch -t 197001030000 $(dhmk_rules_mk); echo $(dhmk_rules_mk))
 
+# Routine used to run an override target if there is one ($1 should be
+# override_{command})
+define dhmk_override_cmd
+$(if $(dhmk_$1),
+	# Running override target ($1)
+	test -z "`ls debian/*.debhelper.log 2>/dev/null`" || sed -i '/^$1[[:space:]]/d' debian/*.debhelper.log
+	$(MAKE) -f $(dhmk_top_makefile) $1 DH_INTERNAL_OVERRIDE="$(call butfirstword,$1,_)" \
+)
+endef
+
 # Routine to run a specific command ($1 should be {target}_{command})
-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 {pre,post}_{target}_{command} targets for each target+command

-- 
Debian Qt/KDE packaging tools