[SCM] Debian package checker branch, master, updated. 2.3.4-96-gaa52039

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit aa5203941a11fc3747ec813278cb91a62913da53
Author: Gunnar Wolf <gwolf@debian.org>
Date:   Mon Apr 12 10:57:10 2010 -0700

    Apply better fix for skipping leading changelog lines in NMU detection
    
    Rather than only skipping the leading multi-author lines, skip any
    leading lines that don't start with an asterisk.

diff --git a/checks/nmu b/checks/nmu
index a02b995..76e6304 100644
--- a/checks/nmu
+++ b/checks/nmu
@@ -53,15 +53,12 @@ if (-l "debfiles/changelog") {
 }
 
 # Get some data from the changelog file.
-my $firstline = '';
 my ($entry) = $info->changelog->data;
 my $distribution = $entry->Distribution;
 my $uploader = canonicalize($entry->Maintainer);
 my $changes = $entry->Changes;
 $changes =~ s/^(\s*\n)+//;
-my @lines = split("\n", $changes);
-shift @lines while (@lines && $lines[0] =~ /^\s*(?:\[.+\])?\s*$/);
-$firstline = $lines[0];
+my $firstline = (grep /^\s*\*/, split('\n', $changes))[0];
 
 # Check the first line for QA and NMU mentions.
 if ($firstline) {
diff --git a/debian/changelog b/debian/changelog
index 6f42c98..a791fbc 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,9 +53,10 @@ lintian (2.4.0) UNRELEASED; urgency=low
   * checks/menus:
     + [ADB] Use Lintian::Check::check_spelling{,_picky}()
   * checks/nmu:
-    + [RA] Skip leading multi-author changelog lines when looking for
-      things like non-maintainer upload notes at the start of the
-      changelog entry.  Thanks, Vincent Danjean.  (Closes: #575192)
+    + [RA] Skip leading changelog lines that do not begin with * when
+      looking for things like non-maintainer upload notes at the start of
+      the changelog entry.  Patch from Gunnar Wolf.  Thanks, Vincent
+      Danjean.  (Closes: #575192)
   * checks/scripts:
     + [RA] Track local diversions like other diversions for the purposes
       of checking for orphans and diversions of unknown files.  Partly

-- 
Debian package checker