[SCM] Debian package checker branch, master, updated. 2.4.2-35-g25219ae

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

The following commit has been merged in the master branch:
commit 25219ae58763730acd1e3b5bf7f1bb4fb677319c
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jul 25 19:03:55 2010 -0700

    Improve parsing of package names containing substvars
    
    * lib/Lintian/Relation.pm:
      + [RA] Don't require a package name component after a substvar to
        follow the rules of the beginning of a package name.  Fixes
        stronger-dependency-implies-weaker false positives containing
        substvars.  (Closes: #580494)

diff --git a/debian/changelog b/debian/changelog
index fe941bc..7f39858 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,11 @@ lintian (2.4.3) UNRELEASED; urgency=low
   * lib/Lintian/Check.pm:
     + [RA] More correctly handle hyphenated words to avoid triggering
       spelling error false positives.  (Closes: #588896)
+  * lib/Lintian/Relation.pm:
+    + [RA] Don't require a package name component after a substvar to
+      follow the rules of the beginning of a package name.  Fixes
+      stronger-dependency-implies-weaker false positives containing
+      substvars.  (Closes: #580494)
   * lib/Lintian/Schedule.pm:
     + [ADB] Import "warning" from Lintian::Output, really fixing the
       error caused by a non-existent file referenced in a .changes
diff --git a/lib/Lintian/Relation.pm b/lib/Lintian/Relation.pm
index e45f4f7..a96b959 100644
--- a/lib/Lintian/Relation.pm
+++ b/lib/Lintian/Relation.pm
@@ -75,11 +75,16 @@ sub parse_element {
     $element =~ /
         ^\s*                            # skip leading whitespace
         (                               # package name or substvar (1)
+         (?:                            #  start of the name
+          [a-zA-Z0-9]                   #   start of a package name
+          |                             #   or
+          \$\{[a-zA-Z0-9:-]+\}          #   substvar
+         )                              #  end of start of the name
          (?:                            #  substvars may be mixed in
-          [a-zA-Z0-9][a-zA-Z0-9+.-]+    #   package name
+          [a-zA-Z0-9+.-]+               #   package name portion
           |                             #   or
           \$\{[a-zA-Z0-9:-]+\}          #   substvar
-         )+                             #  one or more name or substvar
+         )+                             #  one or more portion or substvar
         )                               # end of package name or substvar
         (?:                             # start of optional version
          \s* \(                         # open parenthesis for version part

-- 
Debian package checker