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

    Unset MAKEFLAGS before running make for override detection.
    
    Otherwise make may spit warnings about jobserver whenever debian/rules is run
    with `dpkg-buildpackage -jN` (which adds -jN to MAKEFLAGS).
---
 qt-kde-team/2/dhmk.pl |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/qt-kde-team/2/dhmk.pl b/qt-kde-team/2/dhmk.pl
index 28d7978..df84aa3 100755
--- a/qt-kde-team/2/dhmk.pl
+++ b/qt-kde-team/2/dhmk.pl
@@ -327,6 +327,8 @@ sub get_override_info {
     }
 
     # Now remove overrides based on the rules file output
+    my $saved_makeflags = $ENV{MAKEFLAGS};
+    delete $ENV{MAKEFLAGS};
     open(my $make, "-|", "make", "-f", $rules_file, "-j1", "-n",
         "--no-print-directory",
         @override_targets,
@@ -340,6 +342,7 @@ sub get_override_info {
     if (!close($make)) {
         die "make (get_override_info) failed with $?";
     }
+    $ENV{MAKEFLAGS} = $saved_makeflags if defined $saved_makeflags;
 
     return \%overrides;
 }

-- 
Debian Qt/KDE packaging tools