[SCM] Debian package checker branch, master, updated. 2.2.6-65-g69bc0fc

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

The following commit has been merged in the master branch:
commit 8078d045bcd38806e65e0db990b4e1d31a2959af
Author: Russ Allbery <rra@debian.org>
Date:   Sun Mar 8 17:01:51 2009 -0700

    Redo the skip of the lintian.desc file
    
    Handle skipping lintian.desc with next instead of an if to keep the
    code from wandering farther over to the side than necessary.

diff --git a/frontend/lintian b/frontend/lintian
index fdcdaf3..f6d2666 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1130,58 +1130,56 @@ for my $f (readdir CHECKDIR) {
 
     # ignore check `lintian' (this check is a special case and contains the
     # tag info for the lintian frontend--this script here)
-    if ($script ne 'lintian') {
-
-	delete $secs[0]->{'check-script'};
-	$check_info{$script}->{'script'} = $script;
-	my $p = $check_info{$script};
-
-	set_value($f,$p,'type',$secs[0],1);
-	# convert Type:
-	my ($b,$s,$u) = ( "", "", "" );
-	for (split(/\s*,\s*/o,$p->{'type'})) {
-	    if ($_ eq 'binary') {
-		$b = 'b';
-	    } elsif ($_ eq 'source') {
-		$s = 's';
-	    } elsif ($_ eq 'udeb') {
-		$u = 'u';
-	    } else {
-		fail("unknown type $_ specified in description file $f");
-	    }
-	}
-	$p->{'type'} = "$s$b$u";
+    next if $script eq 'lintian';
 
-	set_value($f,$p,'unpack-level',$secs[0],1);
-	set_value($f,$p,'abbrev',$secs[0],1);
+    delete $secs[0]->{'check-script'};
+    $check_info{$script}->{'script'} = $script;
+    my $p = $check_info{$script};
 
-	if (exists $secs[0]->{'needs-info'} && defined $secs[0]->{'needs-info'}) {
-	    for (split(/\s*,\s*/o,$secs[0]->{'needs-info'})) {
-		$p->{$_} = 1;
-	    }
-	    delete $secs[0]->{'needs-info'};
+    set_value($f,$p,'type',$secs[0],1);
+    # convert Type:
+    my ($b,$s,$u) = ( "", "", "" );
+    for (split(/\s*,\s*/o,$p->{'type'})) {
+	if ($_ eq 'binary') {
+	    $b = 'b';
+	} elsif ($_ eq 'source') {
+	    $s = 's';
+	} elsif ($_ eq 'udeb') {
+	    $u = 'u';
+	} else {
+	    fail("unknown type $_ specified in description file $f");
 	}
+    }
+    $p->{'type'} = "$s$b$u";
 
-	# ignore Info: and other fields for now...
-	delete $secs[0]->{'info'};
-	delete $secs[0]->{'standards-version'};
-	delete $secs[0]->{'author'};
+    set_value($f,$p,'unpack-level',$secs[0],1);
+    set_value($f,$p,'abbrev',$secs[0],1);
 
-	for (keys %{$secs[0]}) {
-	    warning("unused tag $_ in description file $f");
+    if (exists $secs[0]->{'needs-info'} && defined $secs[0]->{'needs-info'}) {
+	for (split(/\s*,\s*/o,$secs[0]->{'needs-info'})) {
+	    $p->{$_} = 1;
 	}
+	delete $secs[0]->{'needs-info'};
+    }
 
-	debug_msg(2, map( { "$_: $p->{$_}" } sort keys %$p ));
+    # ignore Info: and other fields for now...
+    delete $secs[0]->{'info'};
+    delete $secs[0]->{'standards-version'};
+    delete $secs[0]->{'author'};
 
-	shift(@secs);
-	$p->{'requested-tags'} = 0;
-	foreach my $tag (@secs) {
-	    $tag->{'script'} = $script;
-	    Tags::add_tag($tag);
-	    $p->{'requested-tags'}++ if Tags::display_tag($tag);
-	}
-    } # end: if ne lintian
+    for (keys %{$secs[0]}) {
+	warning("unused tag $_ in description file $f");
+    }
 
+    debug_msg(2, map( { "$_: $p->{$_}" } sort keys %$p ));
+
+    shift(@secs);
+    $p->{'requested-tags'} = 0;
+    foreach my $tag (@secs) {
+	$tag->{'script'} = $script;
+	Tags::add_tag($tag);
+	$p->{'requested-tags'}++ if Tags::display_tag($tag);
+    }
 }
 
 closedir(CHECKDIR);

-- 
Debian package checker