[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 2996ce262e2167448f1ddf706850096a942fbe5c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Mar 8 01:34:08 2011 +0200

    Rename 'calc_overrides' to override_info_mode/get_override_info.
---
 qt-kde-team/2/dhmk.mk |    4 ++--
 qt-kde-team/2/dhmk.pl |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index b0c02f0..57db673 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -32,7 +32,7 @@ butfirstword = $(patsubst $(firstword $(subst $2, ,$1))$2%,%,$1)
 .PHONY: FORCE
 
 ############ Handle override calculation ############ 
-ifeq ($(dhmk_calc_overrides),yes)
+ifeq ($(dhmk_override_info_mode),yes)
 
 # Emit magic directives for commands which are not overriden
 override_%: FORCE
@@ -90,5 +90,5 @@ $(foreach t,$(dhmk_standard_targets),debian/dhmk_$(t)): debian/dhmk_%: $$(foreac
 # 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_%
 
-endif # ifeq (dhmk_calc_overrides,yes)
+endif # ifeq (dhmk_override_info_mode,yes)
 
diff --git a/qt-kde-team/2/dhmk.pl b/qt-kde-team/2/dhmk.pl
index c76f4e8..51684f4 100755
--- a/qt-kde-team/2/dhmk.pl
+++ b/qt-kde-team/2/dhmk.pl
@@ -295,7 +295,7 @@ sub get_commands {
     return sort keys %cmds;
 }
 
-sub calc_overrides {
+sub get_override_info {
     my ($rules_file, @commands) = @_;
     my $magic = "##dhmk_no_override##";
 
@@ -311,7 +311,7 @@ sub calc_overrides {
     open(my $make, "-|", "make", "-f", $rules_file, "-j1", "-n",
         "--no-print-directory",
         @override_targets,
-        "dhmk_calc_overrides=yes") or
+        "dhmk_override_info_mode=yes") or
         die "unable to execute make for override calculation: $!";
     while (my $line = <$make>) {
         if ($line =~ /^$magic(.*)$/ && exists $overrides{$1}) {
@@ -319,7 +319,7 @@ sub calc_overrides {
         }
     }
     if (!close($make)) {
-        die "make (calc_override) failed with $?";
+        die "make (get_override_info) failed with $?";
     }
 
     return \%overrides;
@@ -366,7 +366,7 @@ eval {
     if (@{$cmdopts{extraopts}}) {
         Debian::PkgKde::Dhmk::DhCompat::add_extraopts(@{$cmdopts{extraopts}});
     }
-    my $overrides = calc_overrides($RULES_FILE, get_commands($targets));
+    my $overrides = get_override_info($RULES_FILE, get_commands($targets));
     write_dhmk_rules($DHMK_RULES_FILE, $RULES_FILE, $targets, $overrides);
 };
 if ($@) {

-- 
Debian Qt/KDE packaging tools