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

lintian: r134 - in trunk: checks debian testset testset/relations/debian



Author: he
Date: 2004-04-08 20:36:25 +0200 (Thu, 08 Apr 2004)
New Revision: 134

Modified:
   trunk/checks/common_data.pm
   trunk/checks/fields
   trunk/checks/fields.desc
   trunk/debian/changelog
   trunk/testset/info_tags.relations
   trunk/testset/relations/debian/control
   trunk/testset/tags.relations
Log:
* checks/common_data:
  + [HE] Change known_obsolete_fields to allow checks/fields to
    report the Bugs field als obsolete.	  
checks/fields
  + [HE] Add check for an Origin field with "Debian" as value. 
    (Closes: #119618)



Modified: trunk/checks/common_data.pm
===================================================================
--- trunk/checks/common_data.pm	2004-04-08 17:09:26 UTC (rev 133)
+++ trunk/checks/common_data.pm	2004-04-08 18:36:25 UTC (rev 134)
@@ -36,7 +36,7 @@
     ('source', 'version', 'maintainer', 'binary', 'architecture',
      'standards-version', 'files', 'build-depends', 'build-depends-indep',
      'build-conflicts', 'build-conflicts-indep', 'format', 'origin',
-     'uploaders', 'bugs' );
+     'uploaders' );
 
 %known_binary_fields = map { $_ => 1 }
     ('package', 'version', 'architecture', 'depends', 'pre-depends',
@@ -52,7 +52,7 @@
 
 %known_obsolete_fields = map { $_ => 1 }
     ('revision', 'package-revision', 'package_revision',
-     'recommended', 'optional', 'class');
+     'recommended', 'optional', 'class', 'bugs');
 
 %known_essential = map { $_ => 1 }
     ('base-files', 'base-passwd', 'bash', 'bsdutils', 'coreutils',

Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields	2004-04-08 17:09:26 UTC (rev 133)
+++ trunk/checks/fields	2004-04-08 18:36:25 UTC (rev 134)
@@ -396,6 +396,17 @@
 	}
 }
 
+#----- Origin
+
+if (open(FH, "fields/origin")) {
+	my $origin = <FH>;
+	close(FH);
+
+	unfold('origin', \$origin);
+
+	print "W: $pkg $type: redundant-origin-field\n" if $origin =~ /^\s*debian\s*$/i
+}
+
 #----- Field checks (without checking the value)
 
 for my $field (glob("fields/*")) {

Modified: trunk/checks/fields.desc
===================================================================
--- trunk/checks/fields.desc	2004-04-08 17:09:26 UTC (rev 133)
+++ trunk/checks/fields.desc	2004-04-08 18:36:25 UTC (rev 134)
@@ -422,3 +422,8 @@
 Type: error
 Info: The field Installer-Menu-Item should only contain positive integer
  values.
+
+Tag: redundant-origin-field
+Type: warning
+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.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-04-08 17:09:26 UTC (rev 133)
+++ trunk/debian/changelog	2004-04-08 18:36:25 UTC (rev 134)
@@ -13,6 +13,9 @@
 
   * checks/binaries:
     + [JvW] Ignore static binaries in /usr/lib/debug
+  * checks/common_data:
+    + [HE] Change known_obsolete_fields to allow checks/fields to
+    report the Bugs field als obsolete.
   * checks/debconf{,.desc}:
     + [JvW] Add an error for a bogus default for a boolean template
       (Closes: #236846)
@@ -23,6 +26,8 @@
       - bad-relation seems to work better now (Closes: #171763)
       - duplicate relations checking now works for different fields, too
         (Closes: #234978, #235356)
+    + [HE] Add check for an Origin field with "Debian" as value. 
+      (Closes: #119618)
   * checks/files:
     + [HE] New check for compiled python files (*.pyc). Patch by David
       Kimdon <david@kimdon.org>, thanks. (Closes: #236606)

Modified: trunk/testset/info_tags.relations
===================================================================
--- trunk/testset/info_tags.relations	2004-04-08 17:09:26 UTC (rev 133)
+++ trunk/testset/info_tags.relations	2004-04-08 18:36:25 UTC (rev 134)
@@ -16,6 +16,11 @@
 N:   
 N:   Refer to Policy Manual, section 7.1 for details.
 N:
+W: relations source: redundant-origin-field
+N:
+N:   You use the Origin field though the field value is the default
+N:   (Debian). In this case the field is redundant and should be removed.
+N:
 E: relations-multiple-libs: no-copyright-file
 N:
 N:   Each binary package has to include a plain file
@@ -74,6 +79,14 @@
 N:   This is not only sloppy but in the case of libraries, it may well
 N:   break the runtime execution of programs.
 N:
+W: relations-multiple-libs: redundant-origin-field
+E: relations-multiple-libs: obsolete-field bugs
+N:
+N:   This is one of the fields listed in Policy Manual as obsolete.
+N:   
+N:   Refer to policy D.2.6 for details.
+N:
+N: relations-multiple-libs binary: unknown-field-in-changes origin
 E: relations: no-copyright-file
 W: relations: package-relation-with-self depends: relations
 N:
@@ -126,9 +139,7 @@
 N:   already implied by other relations it declares, and is therefore
 N:   redundant. This is not only sloppy but can break some tools.
 N:
+W: relations: redundant-origin-field
+E: relations: obsolete-field bugs
 E: relations: obsolete-field optional
-N:
-N:   This is one of the fields listed in Policy Manual as obsolete.
-N:   
-N:   Refer to policy D.2.6 for details.
-N:
+N: relations binary: unknown-field-in-changes origin

Modified: trunk/testset/relations/debian/control
===================================================================
--- trunk/testset/relations/debian/control	2004-04-08 17:09:26 UTC (rev 133)
+++ trunk/testset/relations/debian/control	2004-04-08 18:36:25 UTC (rev 134)
@@ -4,6 +4,8 @@
 Build-Depends: foo (>> 2) bar baz bat
 Maintainer: Lintian Maintainer <lintian-maint@debian.org>
 Standards-Version: 3.1.1
+Origin: Debian
+Bugs: foobar
 
 Package: relations
 Architecture: all

Modified: trunk/testset/tags.relations
===================================================================
--- trunk/testset/tags.relations	2004-04-08 17:09:26 UTC (rev 133)
+++ trunk/testset/tags.relations	2004-04-08 18:36:25 UTC (rev 134)
@@ -1,5 +1,6 @@
 W: relations source: ancient-standards-version 3.1.1
 E: relations source: bad-relation build-depends: foo (>> 2) bar baz bat
+W: relations source: redundant-origin-field
 E: relations-multiple-libs: no-copyright-file
 W: relations-multiple-libs: description-synopsis-might-not-be-phrased-properly
 E: relations-multiple-libs: description-synopsis-is-duplicated
@@ -8,6 +9,9 @@
 E: relations-multiple-libs: package-depends-on-multiple-tk-versions tk8.2 tk8.3
 E: relations-multiple-libs: package-depends-on-multiple-tkx-versions tkx8.2 tkx8.3
 E: relations-multiple-libs: package-depends-on-multiple-libpng-versions libpng2 libpng3
+W: relations-multiple-libs: redundant-origin-field
+E: relations-multiple-libs: obsolete-field bugs
+N: relations-multiple-libs binary: unknown-field-in-changes origin
 E: relations: no-copyright-file
 W: relations: package-relation-with-self depends: relations
 W: relations: package-relation-with-self depends: relations (<< 3)
@@ -17,4 +21,7 @@
 E: relations: bad-version-in-relation conflicts: foobar (<< 5&5)
 W: relations: package-relation-with-self replaces: relations
 E: relations: package-has-a-duplicate-relation depends: relations, relations (<< 3)
+W: relations: redundant-origin-field
+E: relations: obsolete-field bugs
 E: relations: obsolete-field optional
+N: relations binary: unknown-field-in-changes origin



Reply to: