[SCM] Debian package checker branch, master, updated. 2.5.1-157-g661fb0d

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

The following commit has been merged in the master branch:
commit 661fb0d1b916cdee357c47409730af465068b13e
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Jul 28 19:03:53 2011 +0200

    Ensure dependencies for "override-file"

diff --git a/frontend/lintian b/frontend/lintian
index 2f7f6b7..1e14ea0 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1139,6 +1139,9 @@ if ($action eq 'unpack') {
 } else {
     my @needed = keys %unpack_infos;
     my %added = ();
+    unless ($opt{'no-override'}) {
+	push @needed, 'override-file';
+    }
     while ( my $c = pop @needed ) {
 	next if $added{$c};
 	$added{$c} = 1;
@@ -1168,18 +1171,6 @@ if ($action eq 'unpack') {
 my $map = Lintian::DepMap::Properties->new();
 my $collmap = Lintian::DepMap::Properties->new();
 
-unless ($opt{'no-override'}) {
-    # add the override-file collection
-    $map->add('coll-override-file', {'type' => 'collection', 'name' =>  'override-file'});
-    $collmap->add('coll-override-file', {'type' => 'collection', 'name' =>  'override-file'});
-    if (exists $collection_info{'override-file'}{'needs-info'}) {
-	$map->addp('coll-override-file', 'coll-',
-		   @{$collection_info{'override-file'}{'needs-info'}});
-	$collmap->addp('coll-override-file', 'coll-',
-		   @{$collection_info{'override-file'}{'needs-info'}});
-    }
-}
-
 for my $c (keys %unpack_infos) {
     # Add the collections with their dependency information
     $map->add('coll-' . $c, {'type' => 'collection', 'name' => $c});

-- 
Debian package checker