lintian: r972 - in trunk: checks debian testset testset/binary/debian

[rra@debian.org]

Author: rra
Date: 2007-10-15 05:56:32 +0200 (Mon, 15 Oct 2007)
New Revision: 972

Modified:
   trunk/checks/control-file
   trunk/checks/control-file.desc
   trunk/debian/changelog
   trunk/testset/binary/debian/control
   trunk/testset/tags.binary
Log:
  + [RA] Check for XS-Vcs-* headers and recommend (at info level) that
    they be changed to Vcs-* headers.  (Closes: #444661)

Modified: trunk/checks/control-file
===================================================================
--- trunk/checks/control-file	2007-10-15 03:56:21 UTC (rev 971)
+++ trunk/checks/control-file	2007-10-15 03:56:32 UTC (rev 972)
@@ -20,6 +20,8 @@
 
 package Lintian::control_file;
 use strict;
+use lib "$ENV{'LINTIAN_ROOT'}/checks/";
+use common_data;
 use Util;
 use Tags;
 
@@ -55,6 +57,12 @@
 			tag "debian-control-with-duplicate-fields", "$field: $$seen_fields{$field}, $.";
 		}
 		$seen_fields->{$field} = $.;
+		if ($field =~ /^xs-vcs-/) {
+			my $base = $field;
+			$base =~ s/^xs-//;
+			tag "xs-vcs-header-in-debian-control", "$field"
+			    if $known_source_fields{$base};
+		}
 	}
 }
 close CONTROL;

Modified: trunk/checks/control-file.desc
===================================================================
--- trunk/checks/control-file.desc	2007-10-15 03:56:21 UTC (rev 971)
+++ trunk/checks/control-file.desc	2007-10-15 03:56:32 UTC (rev 972)
@@ -21,8 +21,8 @@
 Tag: build-info-in-binary-control-file-section
 Type: error
 Ref: policy 5.2
-Info: The control file has a `Build-Depends', `Build-Depends-Indep',
- `Build-Conflicts' or `Build-Conflicts-Indep' field in a binary
+Info: The control file has a Build-Depends, Build-Depends-Indep,
+ Build-Conflicts, or Build-Conflicts-Indep field in a binary
  section.  These specify source package relationships, and should be in
  the source section of the control file.
 
@@ -61,3 +61,10 @@
  category of the archive.  A source package in main may only build binary
  packages in main, a source package in non-free may only build binary
  packages in non-free, and so forth.
+
+Tag: xs-vcs-header-in-debian-control
+Type: info
+Info: There is an XS-Vcs-* field in the <tt>debian/control</tt> file.  As
+ of dpkg 1.14.6, the XS- prefix is no longer necessary.  dpkg now
+ recognizes these headers and handles them correctly.  Consider removing
+ the XS- prefix for this field.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-10-15 03:56:21 UTC (rev 971)
+++ trunk/debian/changelog	2007-10-15 03:56:32 UTC (rev 972)
@@ -9,6 +9,8 @@
   * checks/control-file:
     + [RA] Support and ignore comments in debian/control.  Thanks, Julien
       Cristau.  (Closes: #440830)
+    + [RA] Check for XS-Vcs-* headers and recommend (at info level) that
+      they be changed to Vcs-* headers.  (Closes: #444661)
   * checks/cruft.desc:
     + [RA] Fix incorrect tag name for patch failure files.  Thanks, Romain
       Francoise.  (Closes: #437463)

Modified: trunk/testset/binary/debian/control
===================================================================
--- trunk/testset/binary/debian/control	2007-10-15 03:56:21 UTC (rev 971)
+++ trunk/testset/binary/debian/control	2007-10-15 03:56:32 UTC (rev 972)
@@ -6,6 +6,7 @@
 Standards-Version: 3.2.1
 Homepage: http://lintian.debian.org/
 Vcs-Svn: http://svn.wolffelaar.nl/lintian/trunk
+XS-Vcs-Browser: http://svn.wolffelaar.nl/lintian/trunk
 
 Package: binary
 Architecture: any

Modified: trunk/testset/tags.binary
===================================================================
--- trunk/testset/tags.binary	2007-10-15 03:56:21 UTC (rev 971)
+++ trunk/testset/tags.binary	2007-10-15 03:56:32 UTC (rev 972)
@@ -34,6 +34,7 @@
 E: binary: symlink-contains-spurious-segments usr/share/doc/binary/html/ch2.html ../html/./ch1.html
 E: binary: symlink-should-be-relative usr/share/doc/binary/html/ch3.html /usr/share/doc/binary/htm/ch1.html
 E: binary: unstripped-binary-or-object ./usr/bin/hello
+I: binary source: xs-vcs-header-in-debian-control xs-vcs-browser
 I: binary: arch-dep-package-has-big-usr-share
 I: binary: binary-has-unneeded-section ./usr/bin/hello-static .comment
 I: binary: description-contains-homepage