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

[SCM] Debian package checker branch, master, updated. 2.5.6-13-gbcb26a0

The following commit has been merged in the master branch:
commit d3fd4bea2aecfaaadba2049439573bb27c12de73
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Mar 15 00:03:22 2012 +0100

    fields: Remove an old tag
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/fields b/checks/fields
index 800bda2..0e22991 100644
--- a/checks/fields
+++ b/checks/fields
@@ -51,10 +51,6 @@ our %KNOWN_ARCHIVE_PARTS = map { $_ => 1 }
 
 my $KNOWN_PRIOS = Lintian::Data->new ('common/priorities', qr/\s*=\s*/o);
 
-our %known_obsolete_fields = map { $_ => 1 }
-    ('revision', 'package-revision', 'package_revision',
-     'recommended', 'optional', 'class');
-
 our @supported_source_formats =
   ( qr/1\.0/, qr/3\.0\s*\((quilt|native)\)/ );
 
@@ -961,17 +957,14 @@ for my $field (keys %{$info->field}) {
 
     next if ($field eq 'original-maintainer') and $version =~ /ubuntu/;
 
-    tag 'obsolete-field', $field
-        if $known_obsolete_fields{$field};
-
     tag 'unknown-field-in-dsc', $field
-        if ($type eq 'source' && ! $SOURCE_FIELDS->known($field) && ! $known_obsolete_fields{$field});
+        if ($type eq 'source' && ! $SOURCE_FIELDS->known ($field));
 
     tag 'unknown-field-in-control', $field
-        if ($type eq 'binary' && ! $KNOWN_BINARY_FIELDS->known($field) && ! $known_obsolete_fields{$field});
+        if ($type eq 'binary' && ! $KNOWN_BINARY_FIELDS->known ($field));
 
     tag 'unknown-field-in-control', $field
-        if ($type eq 'udeb' && ! $KNOWN_UDEB_FIELDS->known($field) && ! $known_obsolete_fields{$field});
+        if ($type eq 'udeb' && ! $KNOWN_UDEB_FIELDS->known ($field));
 }
 
 }
diff --git a/checks/fields.desc b/checks/fields.desc
index d5906dd..c700383 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -405,13 +405,6 @@ Info: The Homepage field for this package points to CPAN and the URL
  .
    http://search.cpan.org/~samtregar/HTML-Template-2.9/
 
-Tag: obsolete-field
-Severity: important
-Certainty: certain
-Info: This field is listed in the Policy Manual as obsolete and
- not-to-be-present in any package.
-Ref: policy D.2.6
-
 Tag: unknown-field-in-dsc
 Severity: minor
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 62e9608..20711fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lintian (2.5.7) UNRELEASED; urgency=low
     + Removed:
       - manpage-for-non-x11-binary-in-wrong-directory
       - manpage-for-x11-binary-in-wrong-directory
+      - obsolete-field
       - old-app-defaults-directory
       - old-style-example-dir
       - package-installs-file-to-usr-x11r6-bin
@@ -11,6 +12,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
       - package-uses-obsolete-file
       - x11-games-should-be-in-usr-games
 
+  * checks/fields{,.desc}:
+    + [NT] Remove old tags.
   * checks/files{,.desc}:
     + [NT] Remove old tags.
     + [NT] Remove "manual" lazy loads of data files.
diff --git a/t/COVERAGE b/t/COVERAGE
index e0f2e6c..abc2d58 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2012-03-14
-Coverage: 789/953 (82.79%), w. legacy tests: 894/953 (93.81%)
+Coverage: 788/952 (82.77%), w. legacy tests: 893/952 (93.80%)
 
 The following tags are not tested by the test suite:
 
diff --git a/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in b/t/tests/fields-unknown-fields/debian/debian/control.in
similarity index 94%
rename from t/tests/fields-unknown-obsolete-fields/debian/debian/control.in
rename to t/tests/fields-unknown-fields/debian/debian/control.in
index 5197fd0..8b903c2 100644
--- a/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in
+++ b/t/tests/fields-unknown-fields/debian/debian/control.in
@@ -9,7 +9,6 @@ XS-Comment: This is random comment ending up in the dsc file.
 Package: {$srcpkg}
 Architecture: all
 Depends: $\{misc:Depends\},
-XB-Recommended: some-package
 Description: {$description}
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
diff --git a/t/tests/fields-unknown-fields/desc b/t/tests/fields-unknown-fields/desc
new file mode 100644
index 0000000..343f481
--- /dev/null
+++ b/t/tests/fields-unknown-fields/desc
@@ -0,0 +1,6 @@
+Testname: fields-unknown-fields
+Sequence: 6000
+Version: 1.0
+Description: General tests for unknown fields
+Test-For:
+ unknown-field-in-dsc
diff --git a/t/tests/fields-unknown-fields/tags b/t/tests/fields-unknown-fields/tags
new file mode 100644
index 0000000..473338c
--- /dev/null
+++ b/t/tests/fields-unknown-fields/tags
@@ -0,0 +1 @@
+W: fields-unknown-fields source: unknown-field-in-dsc comment
diff --git a/t/tests/fields-unknown-obsolete-fields/desc b/t/tests/fields-unknown-obsolete-fields/desc
deleted file mode 100644
index c48c737..0000000
--- a/t/tests/fields-unknown-obsolete-fields/desc
+++ /dev/null
@@ -1,7 +0,0 @@
-Testname: fields-unknown-obsolete-fields
-Sequence: 6000
-Version: 1.0
-Description: General tests for unknown and obsolete fields
-Test-For:
- obsolete-field
- unknown-field-in-dsc
diff --git a/t/tests/fields-unknown-obsolete-fields/tags b/t/tests/fields-unknown-obsolete-fields/tags
deleted file mode 100644
index e4f5e94..0000000
--- a/t/tests/fields-unknown-obsolete-fields/tags
+++ /dev/null
@@ -1,2 +0,0 @@
-E: fields-unknown-obsolete-fields: obsolete-field recommended
-W: fields-unknown-obsolete-fields source: unknown-field-in-dsc comment

-- 
Debian package checker
Reply to: