[SCM] Debian package checker branch, master, updated. 2.5.1-163-g10b579b

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

The following commit has been merged in the master branch:
commit 10b579b6b461a2122986d47805947d636e1042c1
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jul 31 23:34:21 2011 +0200

    Deprecated --packages-file option

diff --git a/debian/changelog b/debian/changelog
index 909a3ed..6fb26cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -210,6 +210,8 @@ lintian (2.5.2) UNRELEASED; urgency=low
       read packages from the file (one package per line) and process
       these.  Unlike "--packages-file" it allows its argument to be
       "-" for stdin and the format is simpler.
+    + [NT] Deprecated "--packages-file" in favour of the new
+      "--packages-from-file" option.
 
   * lib/Lab.pm:
     + [NT] Removed $dist argument to lab creation, since we rely on
@@ -261,6 +263,8 @@ lintian (2.5.2) UNRELEASED; urgency=low
       that these profiles will silently ignore overrides for
       "fatal" (non-overridable) tags.  (Closes: #536364)
 
+  * reporting/harness:
+    + [NT] Use --packages-from-file instead of --packages-file.
   * reporting/{html_reports,templates/index.tmpl}:
     + [NT] Always emit a page for tags, even if they are not emitted.
       It will also include a link to the entire list of known tags.
diff --git a/frontend/lintian b/frontend/lintian
index dc6ffbb..28e6e9a 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1007,6 +1007,8 @@ if ($check_everything) {
     }
 } elsif ($packages_file) {
     # process all packages listed in packages file?
+    print STDERR "warning: --packages-file is deprecated and may be removed in a later release.\n";
+    print STDERR "  - consider using --packages-from-file (one pkg per line)\n";
     open(my $pkgin, '<', $packages_file) or fail("Reading $packages_file: $!");
     while (my $line = <$pkgin>) {
 	chomp($line);
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index 9c8b6ba..cc9b5fd 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -414,6 +414,9 @@ package), B<package> is the package name, B<version> is the package's
 version, and B<file> is the package file name (absolute path
 specification).
 
+Please note this has been deprecated in favour B<--packages-from-file>,
+which does not require a weird/special syntax.
+
 =item B<--packages-from-file> X
 
 Process the packages listed in X.  Lintian will parse each line (all
diff --git a/reporting/harness b/reporting/harness
index 96a76f2..81c8ff0 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -190,17 +190,17 @@ if ($opt_i) { # process changes only
 	    if ($binsrc eq 'binary') {
 		my $data = $binary_info{$pkg};
 		$data or Die("cannot find binary package $pkg in binary-packages file");
-		print OUT "b $binary_info{$pkg}->{'package'} $binary_info{$pkg}->{'version'} $LINTIAN_ARCHIVEDIR/$binary_info{$pkg}->{'file'}\n";
+		print OUT "$LINTIAN_ARCHIVEDIR/$binary_info{$pkg}->{'file'}\n";
 		$skip_binary{$pkg} = 1;
 	    } elsif ($binsrc eq 'udeb') {
 		my $data = $udeb_info{$pkg};
 		$data or Die("cannot find udeb package $pkg in udeb-packages file");
-		print OUT "u $udeb_info{$pkg}->{'package'} $udeb_info{$pkg}->{'version'} $LINTIAN_ARCHIVEDIR/$udeb_info{$pkg}->{'file'}\n";
+		print OUT "$LINTIAN_ARCHIVEDIR/$udeb_info{$pkg}->{'file'}\n";
 		$skip_udeb{$pkg} = 1;
 	    } else {
 		my $data = $source_info{$pkg};
 		$data or Die("cannot find source package $pkg in source-packages file");
-		print OUT "s $source_info{$pkg}->{'source'} $source_info{$pkg}->{'version'} $LINTIAN_ARCHIVEDIR/$source_info{$pkg}->{'file'}\n";
+		print OUT "$LINTIAN_ARCHIVEDIR/$source_info{$pkg}->{'file'}\n";
 		$skip_source{$pkg} = 1;
 	    }
 	} elsif (/^N: Removed (binary|udeb|source) package (\S+)/o) {
@@ -258,7 +258,7 @@ if ($opt_i) { # process changes only
 
     # run Lintian over the newly introduced or changed packages
     Log('Running Lintian over newly introduced and changed packages...');
-    my $cmd = "$lintian_cmd -I -E --pedantic -v --show-overrides -p $list_file -U changelog-file >>$lintian_log 2>&1";
+    my $cmd = "$lintian_cmd -I -E --pedantic -v --show-overrides --packages-from-file $list_file -U changelog-file >>$lintian_log 2>&1";
     Log("Executing $cmd");
     my $res = (system($cmd) >> 8);
     (($res == 0) or ($res == 1))

-- 
Debian package checker