[SCM] Debian package checker branch, master, updated. 2.5.3-56-g54e2e02

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

The following commit has been merged in the master branch:
commit 54e2e0258a5ada5fe6fd6ed21911e1bbdd698bb2
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Oct 9 15:44:47 2011 +0200

    Document which collections are auto-removed in the manpage
    
    This includes a number of unrelated style fixes to the manpage
    generator.  The description of the deprecated source-control-file
    was updated to look better in the manpage.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/source-control-file.desc b/collection/source-control-file.desc
index 27ce1c3..1b9bb37 100644
--- a/collection/source-control-file.desc
+++ b/collection/source-control-file.desc
@@ -1,9 +1,7 @@
 Collector-Script: source-control-file
 Author: Frank Lichtenheld <djpig@debian.org>
-Info: Collects information about binary packages from debian/control in source packages
- .
- This is deprecated and does nothing (but clean up).  Checks should migrate to
- Lintian::Collect::Source::{binaries,binary_field}.
+Info: This is deprecated and does nothing (but clean up).  Checks
+ should migrate to Lintian::Collect::Source::{binaries,binary_field}.
 Type: source
 Version: 1
 Auto-Remove: yes
diff --git a/debian/changelog b/debian/changelog
index 3a14196..26af8d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,10 @@ lintian (2.5.4) UNRELEASED; urgency=low
     + [JW] Use "paragraph" and "field" rather than "section" and "tag"
       when referring to a Debian control file.
 
+  * private/generate-lintian-pod:
+    + [NT] Document which collections are auto-removed by default in
+      static labs.
+
   * reporting/*:
     + [NT] Recognise and display pedantic tags.
     + [JW] Only emit "plus X overrides" if there any overrides.
diff --git a/private/generate-lintian-pod b/private/generate-lintian-pod
index 2ee5542..bddfecd 100755
--- a/private/generate-lintian-pod
+++ b/private/generate-lintian-pod
@@ -11,22 +11,22 @@ use Util qw(read_dpkg_control fail);
 my @keywords = ();
 
 foreach my $kw (qw(conffiles shlibs Standards-Version)){
-    push(@keywords, [$kw, "B<$kw>"]);
+    push @keywords, [qr/$kw/, "B<$kw>"];
 }
 
-open(my $file, '<', 'man/lintian.pod.in') or fail("man/lintian.pod.in: $!");
+open my $file, '<', 'man/lintian.pod.in' or fail "man/lintian.pod.in: $!";
 
 while(my $line = <$file>){
     chomp($line);
     if($line eq '@CHECKS@'){
-        extract_data('checks', 'check-script', 'abbrev');
+        extract_data ('checks', 'check-script', 'abbrev');
     } elsif($line eq '@COLLECTION@'){
-        extract_data('collection', 'collector-script');
+        extract_data ('collection', 'collector-script');
     } else {
         print "$line\n";
     }
 }
-close($file);
+close $file;
 
 sub pretty_print {
     my $text = shift;
@@ -35,7 +35,7 @@ sub pretty_print {
     $text =~ s@\n\s@\n@og;
     $text =~ s/\&([^;]+)\;/E<$1>/og;  # do &gt; -> E<gt>
     $text =~ s/(\S+\(\d+\))/L<$1>/og; # link to manpages
-    foreach my $line (split(/\n/o, $text)){
+    foreach my $line (split /\n/o, $text) {
         if($line =~ m/^ /o){
             if(!$inex){
                 # Start of an example.
@@ -73,25 +73,28 @@ sub extract_data {
     my ($folder, $fname, $abname) = @_;
     print "=over 4\n\n";
     foreach my $file (<$folder/*.desc>) {
-        my ($header, @ignore) = read_dpkg_control($file);
+        my ($header, @ignore) = read_dpkg_control ($file);
         my $name = $header->{$fname};
         my $abbr;
         my $desc;
-        next if($name eq 'lintian');
-        if(defined($abname)){
+        next if $name eq 'lintian';
+        if (defined $abname) {
             $abbr = $header->{$abname};
         }
-        if(!defined($header->{'manpage'})){
+        if (!defined $header->{'manpage'}) {
             $desc = $header->{'info'};
         } else {
             $desc = $header->{'manpage'};
         }
-        if($abbr){
+        if ($abbr) {
             print "=item B<$name> (B<$abbr>)\n\n";
         } else {
             print "=item B<$name>\n\n"
         }
         pretty_print($desc);
+        if (lc ($header->{'auto-remove'}//'') eq 'yes') {
+            print "This collection is auto-removed by default in static labs.\n\n"
+        }
     }
     print "=back\n\n";
 }

-- 
Debian package checker