[SCM] Debian package checker branch, master, updated. 2.5.3-9-g80ec6f4

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

The following commit has been merged in the master branch:
commit 80ec6f4b56e558b1b2294b8b137b383395070246
Author: Jakub Wilk <jwilk@debian.org>
Date:   Thu Sep 15 16:03:29 2011 +0200

    Fixed calls to binary_field in binary_relation
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 392295a..fcb2f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ lintian (2.5.4) UNRELEASED; urgency=low
   * lib/Lab.pm:
     + [NT] Updated it to use Lintian::Output::verbosity_level rather
       than verbose.
+  * lib/Lintian/Collect/Source.pm:
+    + [JW] Fixed call to binary_field in binary_relation.
+      (Closes: #641609)
   * lib/Lintian/Output/XML.pm:
     + [NT] Use self-closing tags (if possible) and do not write
       attributes with an empty value.
diff --git a/lib/Lintian/Collect/Source.pm b/lib/Lintian/Collect/Source.pm
index a71c115..741842c 100644
--- a/lib/Lintian/Collect/Source.pm
+++ b/lib/Lintian/Collect/Source.pm
@@ -23,6 +23,7 @@ use strict;
 use warnings;
 use base 'Lintian::Collect::Package';
 
+use Carp qw(croak);
 use Cwd();
 
 use Lintian::Relation;
@@ -186,7 +187,7 @@ sub binary_relation {
         my $merged;
         for my $f (@{ $special{$field} }) {
 	    # sub binary_relation Needs-Info :binary_field
-            my $value = $self->binary_field($f);
+            my $value = $self->binary_field($package, $f);
             $merged .= ', ' if (defined($merged) and defined($value));
             $merged .= $value if defined($value);
         }
@@ -196,12 +197,12 @@ sub binary_relation {
             qw(pre-depends depends recommends suggests enhances breaks
                conflicts provides replaces);
         croak("unknown relation field $field") unless $known{$field};
-        my $value = $self->binary_field($field);
+        my $value = $self->binary_field($package, $field);
         $result = $value if defined($value);
     }
     $result = Lintian::Relation->new($result);
     $self->{binary_relation}->{$package}->{$field} = $result;
-    return $self->{binary_relation}->{$field};
+    return $result;
 }
 
 

-- 
Debian package checker