[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

lintian: r836 - in trunk: checks debian testset



Author: rra
Date: 2007-03-17 08:38:35 +0100 (Sat, 17 Mar 2007)
New Revision: 836

Modified:
   trunk/checks/fields
   trunk/checks/fields.desc
   trunk/checks/nmu
   trunk/debian/changelog
   trunk/testset/tags.manpages
Log:
  + [RA] Recognize the +bX convention for binary NMUs.  Warn about use
    of the old three-part version numbers.
* checks/nmu{.desc,}:
  + [RA] Recognize the +bX convention for binary NMUs.

Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields	2007-03-17 06:07:49 UTC (rev 835)
+++ trunk/checks/fields	2007-03-17 07:38:35 UTC (rev 836)
@@ -5,7 +5,7 @@
 # Parts of the code were taken from the old check script, which
 # was Copyright (C) 1998 Richard Braakman (also licensed under the
 # GPL 2 or higher)
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -155,10 +155,16 @@
 			if (not defined $1 or defined $2) {
 				tag "debian-revision-not-well-formed", "$version";
 			}
-			if ($debian =~ /^-[^.]+\.[^.]+\./ && ($type eq "source")) {
-				tag "binary-nmu-debian-revision-in-source", "$version";
+			if ($debian =~ /^-[^.-]+\.[^.-]+\./) {
+				tag "binary-nmu-uses-old-version-style", "$version"
+					if $type eq 'binary';
+				tag "binary-nmu-debian-revision-in-source", "$version"
+					if $type eq 'source';
 			}
 		}
+		if ($version =~ /\+b\d+$/ && $type eq "source") {
+			tag "binary-nmu-debian-revision-in-source", "$version";
+		}
 	} else {
 		tag "bad-version-number", "$version";
 	}

Modified: trunk/checks/fields.desc
===================================================================
--- trunk/checks/fields.desc	2007-03-17 06:07:49 UTC (rev 835)
+++ trunk/checks/fields.desc	2007-03-17 07:38:35 UTC (rev 836)
@@ -606,11 +606,22 @@
 Info: You use the Origin field though the field value is the default (Debian).
  In this case the field is redundant and should be removed.
 
+Tag: binary-nmu-uses-old-version-style
+Type: warning
+Ref: devref 5.10.2.1
+Info: The version number of a binary NMU should be formed by appending
+ '+b' and a digit to the source version.  This version scheme is
+ special-cased by the archive software.  The -x.x.x version number style
+ is considered obsolete.
+
 Tag: binary-nmu-debian-revision-in-source
 Type: warning
 Ref: devref 5.10.2.1
-Info: The version number of your source package has a debian revision with
- three parts, which is usually used by binary NMUs.
+Info: The version number of your source package ends in +b and a number or
+ has a Debian revision containing three parts.  These version numbers are
+ used by binary NMUs and should not be used as the source version.  (The
+ +b form is the current standard; the three-part version number is the old
+ standard.)
 
 Tag: redundant-bugs-field
 Type: warning

Modified: trunk/checks/nmu
===================================================================
--- trunk/checks/nmu	2007-03-17 06:07:49 UTC (rev 835)
+++ trunk/checks/nmu	2007-03-17 07:38:35 UTC (rev 836)
@@ -66,6 +66,9 @@
 	$version_nmuness = 1 if defined $1;
 	$version_nmuness = 2 if defined $2;
 }
+if ($version =~ /\+b\d+$/) {
+	$version_nmuness = 2;
+}
 
 my $upload_is_nmu = $uploader ne $maintainer;
 if (defined $uploaders) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-03-17 06:07:49 UTC (rev 835)
+++ trunk/debian/changelog	2007-03-17 07:38:35 UTC (rev 836)
@@ -35,13 +35,16 @@
       clean-should-be-satisfied-by-build-depends to make the reason for
       the message clearer without running lintian -i.  Thanks to Osamu
       Aoki for the suggestion.  (Closes: #405840)
+    + [RA] Recognize the +bX convention for binary NMUs.  Warn about use
+      of the old three-part version numbers.
   * checks/menus:
     + [JA] Perl syntax corrections.  Removed extra empty newlines.
   * checks/lintian.desc:
     + [RA] List emergency as a valid urgency.
-  * checks/nmu.desc:
+  * checks/nmu{.desc,}:
     + [RA] List the exact phrases recognized by lintian as marking an NMU.
       Reported by Jari Aalto.  (Closes: #409108)
+    + [RA] Recognize the +bX convention for binary NMUs.
   * checks/po-debconf:
     + [RA] Now that we're passing --use-untranslated to msgcmp, we have to
       compare the generated pot file with the one in the package both

Modified: trunk/testset/tags.manpages
===================================================================
--- trunk/testset/tags.manpages	2007-03-17 06:07:49 UTC (rev 835)
+++ trunk/testset/tags.manpages	2007-03-17 07:38:35 UTC (rev 836)
@@ -33,6 +33,7 @@
 W: manpages source: binary-nmu-debian-revision-in-source 4-0.0.1
 W: manpages source: changelog-should-mention-nmu
 W: manpages source: source-nmu-has-incorrect-version-number 4-0.0.1
+W: manpages: binary-nmu-uses-old-version-style 4-0.0.1
 W: manpages: binary-without-english-manpage binary-without-english-manpage
 W: manpages: executable-not-elf-or-script ./usr/bin/binary-without-english-manpage
 W: manpages: executable-not-elf-or-script ./usr/bin/usr-bin-binary-alt



Reply to: