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

[SCM] Debian package checker branch, master, updated. 2.5.6-19-g2e16b65

The following commit has been merged in the master branch:
commit 2e16b658d51487df9c176edcacbcc2243068ac35
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Mar 19 16:15:58 2012 +0100

    fields: Drop old-style binNMU tag
    
    Also fix some bad indentation in c/fields around the affected code.
    
    Merge all "Remove old/redundant tag(s)" in d/changelog.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/fields b/checks/fields
index 0e22991..5a0bcbe 100644
--- a/checks/fields
+++ b/checks/fields
@@ -199,22 +199,19 @@ if (not defined $info->field('version')) {
         my $ubuntu;
         if($debian =~ m/^(?:[^.]+)(?:\.[^.]+)?(?:\.[^.]+)?(\..*)?$/o){
             my $extra = $1;
-            if (defined $extra
-            && $debian =~ /^(?:[^.]+ubuntu[^.]+)(?:\.\d+){1,3}(\..*)?$/o){
-            $ubuntu = 1;
-            $extra = $1;
+            if (defined $extra && $debian =~ /^(?:[^.]+ubuntu[^.]+)(?:\.\d+){1,3}(\..*)?$/o){
+                $ubuntu = 1;
+                $extra = $1;
             }
             if (defined $extra) {
-            tag 'debian-revision-not-well-formed', $version;
+                tag 'debian-revision-not-well-formed', $version;
             }
         } else {
             tag 'debian-revision-not-well-formed', $version;
         }
         if ($debian =~ /^[^.-]+\.[^.-]+\./o and not $ubuntu) {
-            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 $type eq 'source';
         }
         if ($version =~ /\+b\d+$/ && $type eq 'source') {
             tag 'binary-nmu-debian-revision-in-source', $version;
@@ -235,7 +232,7 @@ if (not defined $info->field('version')) {
 
         my $name = $info->field('package');
         if ($name && $PERL_CORE_PROVIDES->known($name) &&
-            perl_core_has_version($name, '>=', $upstream)) {
+                perl_core_has_version($name, '>=', $upstream)) {
             my $core_version = $PERL_CORE_PROVIDES->value($name);
             tag 'package-superseded-by-perl', "with $core_version"
         }
diff --git a/checks/fields.desc b/checks/fields.desc
index c700383..cff4c45 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -804,15 +804,6 @@ Certainty: certain
 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
-Severity: normal
-Certainty: certain
-Ref: devref 5.10.2.1
-Info: The version number of a binary NMU should be formed by appending
- <tt>+b</tt> and a digit to the source version.  This version scheme is
- special-cased by the archive software.  The -x.x.x version number style
- should no longer be used.
-
 Tag: binary-nmu-debian-revision-in-source
 Severity: normal
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 4e26a77..5d489cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lintian (2.5.7) UNRELEASED; urgency=low
     + Removed:
       - ancient-dpkg-long-filenames-check
       - ancient-dpkg-predepends-check
+      - binary-nmu-uses-old-version-style
       - debian-control-with-duplicate-fields
       - doc-base-file-references-usr-doc
       - duplicate-fields-in-templates
@@ -19,27 +20,17 @@ lintian (2.5.7) UNRELEASED; urgency=low
       - postinst-should-not-set-usr-doc-link
       - x11-games-should-be-in-usr-games
 
-  * checks/copyright-file{,.desc}:
-    + [NT] Remove old tags.
-  * checks/control-file{,.desc}:
-    + [NT] Remove redundant tag.
-  * checks/debconf{,.desc}:
-    + [NT] Remove redundant tag.
-  * checks/fields{,.desc}:
-    + [NT] Remove old tags.
+  * checks/*:
+    + [NT] Remove some old tags that are no longer useful.
+      (Closes: #663516)
   * checks/files{,.desc}:
-    + [NT] Remove old tags.
     + [NT] Remove "manual" lazy loads of data files.
     + [NT] Remove code for the uses-FHS-doc-dir tag.
   * checks/manpages{,.desc}:
-    + [NT] Remove old tags.
     + [RA] Detect hyphen used as minus sign following a groff \f[C] font
       change.  Thanks, Iustin Pop.  (Closes: #664471)
   * checks/menus{,.desc}:
     + [NT] Remove "manual" lazy load of data file.
-    + [NT] Remove old tags.
-  * checks/scripts{,.desc}:
-    + [NT] Remove old tags.
 
   * collection/objdump-info:
     + [NT] Use "fail" from Util.pm rather than embedding a copy of
diff --git a/t/COVERAGE b/t/COVERAGE
index ad504b4..e9c2335 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2012-03-18
-Coverage: 783/945 (82.86%), w. legacy tests: 888/945 (93.97%)
+Last generated 2012-03-19
+Coverage: 782/944 (82.84%), w. legacy tests: 887/944 (93.96%)
 
 The following tags are not tested by the test suite:
 
diff --git a/t/tests/fields-binary-nmu-version/desc b/t/tests/fields-binary-nmu-version/desc
index 56f75ca..df1392e 100644
--- a/t/tests/fields-binary-nmu-version/desc
+++ b/t/tests/fields-binary-nmu-version/desc
@@ -3,6 +3,4 @@ Sequence: 6000
 Type: non-native
 Version: 1.0-1.0.1
 Description: Check binary NMU version handling
-Test-For:
- binary-nmu-debian-revision-in-source
- binary-nmu-uses-old-version-style
+Test-For: binary-nmu-debian-revision-in-source
diff --git a/t/tests/fields-binary-nmu-version/tags b/t/tests/fields-binary-nmu-version/tags
index c19a4ea..a9eee6d 100644
--- a/t/tests/fields-binary-nmu-version/tags
+++ b/t/tests/fields-binary-nmu-version/tags
@@ -1,3 +1,2 @@
 W: fields-binary-nmu-version source: binary-nmu-debian-revision-in-source 1.0-1.0.1
 W: fields-binary-nmu-version source: source-nmu-has-incorrect-version-number 1.0-1.0.1
-W: fields-binary-nmu-version: binary-nmu-uses-old-version-style 1.0-1.0.1

-- 
Debian package checker
Reply to: