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

[rra@debian.org]

Author: rra
Date: 2007-02-27 08:37:27 +0100 (Tue, 27 Feb 2007)
New Revision: 825

Modified:
   trunk/checks/control-file
   trunk/debian/changelog
   trunk/testset/relations/debian/control
   trunk/testset/tags.relations
Log:
* checks/control-file:
  + [RA] Allow source in main to generate contrib packages.  Thanks,
    Bdale Garbee.  (Closes: #401881)

Modified: trunk/checks/control-file
===================================================================
--- trunk/checks/control-file	2007-02-27 07:23:29 UTC (rev 824)
+++ trunk/checks/control-file	2007-02-27 07:37:27 UTC (rev 825)
@@ -66,7 +66,8 @@
 	        $binary_control->{"build-conflicts"} || $binary_control->{"build-conflicts-indep"});
 }
 
-# Check that every package is in the same archive category.  The source
+# Check that every package is in the same archive category, except that
+# sources in main can deliver both main and contrib packages.  The source
 # package may or may not have a section specified; if it doesn't, derive the
 # expected archive category from the first binary package by leaving $category
 # undefined until parsing the first binary section.  Missing sections will be
@@ -85,7 +86,7 @@
 	next unless $binary_control->{'section'};
 	if (!defined ($category)) {
 		if ($binary_control->{'section'} =~ m%^([^/]+)/%) {
-			$category = $1;
+			$category = ($1 eq 'contrib') ? '' : $1;
 		} else {
 			$category = '';
 		}
@@ -94,7 +95,7 @@
 	tag "section-category-mismatch", "Package " . $binary_control->{'package'}
 		if ($category && $binary_control->{'section'} !~ m%^$category/%);
 	tag "section-category-mismatch", "Package " . $binary_control->{'package'}
-		if (!$category && $binary_control->{'section'} =~ m%^[^/]+/%);
+		if (!$category && $binary_control->{'section'} =~ m%^([^/]+)/% && $1 ne 'contrib');
 }
 
 }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-02-27 07:23:29 UTC (rev 824)
+++ trunk/debian/changelog	2007-02-27 07:37:27 UTC (rev 825)
@@ -9,6 +9,9 @@
     + [JA] Perl syntax corrections.
     + [JA] Support the Autobuild: and Vcs-* fields in .dsc files.
       Applied patch to implement this by Ian Beckwith.  (Closes: #403553).
+  * checks/control-file:
+    + [RA] Allow source in main to generate contrib packages.  Thanks,
+      Bdale Garbee.  (Closes: #401881)
   * checks/cruft:
     + [RA] Use Dep to check autotools-dev build dependency rather than
       rolling our own dependency parsing, thus avoiding problems when it's

Modified: trunk/testset/relations/debian/control
===================================================================
--- trunk/testset/relations/debian/control	2007-02-27 07:23:29 UTC (rev 824)
+++ trunk/testset/relations/debian/control	2007-02-27 07:37:27 UTC (rev 825)
@@ -15,6 +15,7 @@
 
 Package: relations
 Architecture: all
+Section: contrib/misc
 Depends: relations, relations(<< 3), dpkg, bash (>> 2.0 ), mail-transport-agent, gawk | awk, foo (>> 2.0), foo (<< 2.2), coreutils, null (>= 0)
 Provides: mail-reader
 Replaces: relations

Modified: trunk/testset/tags.relations
===================================================================
--- trunk/testset/tags.relations	2007-02-27 07:23:29 UTC (rev 824)
+++ trunk/testset/tags.relations	2007-02-27 07:37:27 UTC (rev 825)
@@ -4,7 +4,7 @@
 E: relations source: build-depends-on-essential-package-without-using-version build-depends-indep: bash
 E: relations source: build-depends-on-essential-package-without-using-version build-depends: findutils
 E: relations source: build-depends-on-obsolete-package build-depends-indep: debmake
-E: relations source: debian-control-with-duplicate-fields provides: 36, 37
+E: relations source: debian-control-with-duplicate-fields provides: 37, 38
 E: relations source: depends-on-build-essential-package-without-using-version libc6-dev [build-depends: libc6-dev]
 E: relations source: depends-on-build-essential-package-without-using-version make [build-depends-indep: make]
 E: relations source: invalid-arch-string-in-source-relation test [build-conflicts: bar [alpha test]]