[SCM] Debian package checker branch, master, updated. 2.5.8-26-gf7e5b14

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit f7e5b149ee1604f5b53661e93c0d6fce250eb51a
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Jun 15 20:20:53 2012 +0200

    L::C::Source: Recognise Package-Type as alt of X-Package-Type
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index fe5c85b..c198861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,9 @@ lintian (2.5.9) UNRELEASED; urgency=low
   * lib/Lintian/Collect/Package.pm:
     + [NT] sorted_index now returns a list rather than a list ref.
     + [NT] Represent files (from index) as Lintian::Path objects.
+  * lib/Lintian/Collect/Source.pm:
+    + [NT] Recognise "Package-Type" as an alternative of the "X-"
+      field of same name.  (Closes: #677649)
   * lib/Lintian/Data.pm:
     + [NT] Gracefully handle the absence of $ENV{HOME}.
   * lib/Lintian/Path.pm:
diff --git a/lib/Lintian/Collect/Source.pm b/lib/Lintian/Collect/Source.pm
index f059360..a4122fc 100644
--- a/lib/Lintian/Collect/Source.pm
+++ b/lib/Lintian/Collect/Source.pm
@@ -110,7 +110,8 @@ sub binaries {
 
     my %binaries;
     foreach my $pkg (keys %{ $self->{binary_field} } ) {
-        my $type = $self->binary_field($pkg, 'xc-package-type') || 'deb';
+        my $type = $self->binary_field ($pkg, 'package-type');
+        $type ||= $self->binary_field ($pkg, 'xc-package-type') || 'deb';
         $binaries{$pkg} = lc $type;
     }
 

-- 
Debian package checker