[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 e6ccf899303f150c7c9ad16284a2237cb26a0bbf
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Mar 11 02:47:13 2011 +0200

    Improve performance of debian-qt-kde.mk in dhmk override info mode.
    
    Skip most of debian-qt-kde.mk when dhmk is running in the override info mode.
    This improves dhmk.pl performance pretty significantly (> 3 times).
    
    The slowdown is mostly caused by slow $(shell) functions (e.g.
    dpkg-parsechangelog). make executes them even when running in the --dry-run
    mode. Another reason is that most $(shell) variable assignments are of := type.
---
 qt-kde-team/2/debian-qt-kde.mk |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/qt-kde-team/2/debian-qt-kde.mk b/qt-kde-team/2/debian-qt-kde.mk
index 36c54ca..23e0ca0 100644
--- a/qt-kde-team/2/debian-qt-kde.mk
+++ b/qt-kde-team/2/debian-qt-kde.mk
@@ -1,6 +1,14 @@
 ifndef dqk_dir
 
 dqk_dir := $(dir $(lastword $(MAKEFILE_LIST)))
+
+# Include dhmk file
+include $(dqk_dir)dhmk.mk
+
+# For performance reasons skip the rest in the override info mode. The slowdown
+# is mostly caused by $(shell) functions (e.g. dpkg-parsechangelog).
+ifneq ($(dhmk_override_info_mode),yes)
+
 dqk_sourcepkg := $(shell dpkg-parsechangelog | sed -n '/^Source:/{ s/^Source:[[:space:]]*//; p; q }')
 dqk_upstream_version ?= $(shell dpkg-parsechangelog | sed -n '/^Version:/{ s/^Version:[[:space:]]*\(.*\)-.*/\1/g; p; q }')
 dqk_destdir = $(CURDIR)/debian/tmp
@@ -8,9 +16,6 @@ dqk_destdir = $(CURDIR)/debian/tmp
 # We want to use kde and pkgkde-symbolshelper plugins by default
 dh := --with=kde,pkgkde-symbolshelper $(dh)
 
-# Include dhmk file
-include $(dqk_dir)dhmk.mk
-
 # dqk_disable_policy_check lists distributions for which policy check should be
 # disabled
 dqk_disable_policy_check ?=
@@ -88,4 +93,5 @@ $(foreach t,install-indep install,post_$(t)_dh_install): install_to_doc-html_pac
 
 .PHONY: run_dh_sameversiondep cleanup_manpages install_to_doc-html_package
 
+endif # ifneq ($(dhmk_override_info_mode),yes)
 endif # ifndef dqk_dir

-- 
Debian Qt/KDE packaging tools