[SCM] Git repository for devscripts branch, master, updated. v2.11.7-63-g7a99e54

[James McCoy]

The following commit has been merged in the master branch:
commit 7a99e5498ad3413b0e909302d16c5cb59451ba7a
Author: Bernhard R. Link <brlink at debian.org>
Date:   Sun Jun 10 11:32:08 2012 +0200

    debchange: fix NMU detection to not NMU QA packages
    
    Orphaned packages can by definition not be NMUed, so fix
    the NMU detection to not trigger if the maintainer contains
    the packages at qa.debian.org address.
    
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index b575bdd..a100c6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ devscripts (2.11.9) UNRELEASED; urgency=low
   [ Christoph Berg ]
   * debcheckout: Also recognize bzr+ssh:// schema.
 
+  [ Bernhard R. Link ]
+  * debchange: fix NMU detection to not NMU QA packages (Closes: #676881)
+
  -- David Prévot <taffit at debian.org>  Thu, 31 May 2012 12:12:02 -0400
 
 devscripts (2.11.8) unstable; urgency=low
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 17a4d3d..9e7b933 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -862,7 +862,8 @@ if ($opt_auto_nmu eq 'yes' and ! $opt_v and ! $opt_l and ! $opt_s and
 
 	    my $packager = "$MAINTAINER <$EMAIL>";
 
-	    if (! grep { $_ eq $packager } ($maintainer, @uploaders) and
+	    if ($maintainer !~ m/<packages\@qa\.debian\.org>/ and
+		! grep { $_ eq $packager } ($maintainer, @uploaders) and
 		$packager ne $changelog{'Maintainer'} and ! $opt_team) {
 		$opt_n=1;
 		$opt_a=0;

-- 
Git repository for devscripts