[SCM] Debian package checker branch, master, updated. 2.2.10-7-g29c01c7

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

The following commit has been merged in the master branch:
commit d431e568dc33b6f862466218908d337fff43626b
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Sat May 2 23:24:54 2009 +0100

    Use the term "archive areas" to refer to main, contrib and non-free
    
    * checks/control-file{,.desc}:
      + [ADB] Refer to main, contrib and non-free as archive areas rather
        than categories.
      + [ADB] Rename section-category-mismatch to section-area-mismatch.

diff --git a/checks/control-file b/checks/control-file
index b085d95..d0f9867 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -136,21 +136,21 @@ for my $control (@binary_controls) {
 	}
 }
 
-# Check that every package is in the same archive category, except that
+# Check that every package is in the same archive area, 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
+# expected archive area from the first binary package by leaving $area
 # undefined until parsing the first binary section.  Missing sections will be
 # caught by other checks.
 #
 # Also accumulate short and long descriptions for each package so that we can
 # check for duplication.
-my $category;
+my $area;
 if ($header->{'section'}) {
 	if ($header->{'section'} =~ m%^([^/]+)/%) {
-		$category = $1;
+		$area = $1;
 	} else {
-		$category = '';
+		$area = '';
 	}
 } else {
 	tag "no-section-field-for-source", "";
@@ -160,18 +160,18 @@ for my $binary_control (@binary_controls) {
 	push(@descriptions, [ $binary_control->{'package'}, split("\n", $binary_control->{'description'}, 2) ])
 	    if $binary_control->{'description'};
 	next unless $binary_control->{'section'};
-	if (!defined ($category)) {
+	if (!defined ($area)) {
 		if ($binary_control->{'section'} =~ m%^([^/]+)/%) {
-			$category = ($1 eq 'contrib') ? '' : $1;
+			$area = ($1 eq 'contrib') ? '' : $1;
 		} else {
-			$category = '';
+			$area = '';
 		}
 		next;
 	}
-	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%^([^/]+)/% && $1 ne 'contrib');
+	tag "section-area-mismatch", "Package " . $binary_control->{'package'}
+		if ($area && $binary_control->{'section'} !~ m%^$area/%);
+	tag "section-area-mismatch", "Package " . $binary_control->{'package'}
+		if (!$area && $binary_control->{'section'} =~ m%^([^/]+)/% && $1 ne 'contrib');
 }
 
 # Check for duplicate descriptions.
diff --git a/checks/control-file.desc b/checks/control-file.desc
index cd15ba1..19e716e 100644
--- a/checks/control-file.desc
+++ b/checks/control-file.desc
@@ -70,14 +70,14 @@ Info: The package does not have a "Section:" field in the source package
  section of its control file.  The Section field is required for source
  packages at the request of the Debian ftp-masters.
 
-Tag: section-category-mismatch
+Tag: section-area-mismatch
 Severity: important
 Certainty: certain
 Info: The <tt>debian/control</tt> file places the indicated binary package
- in a different archive category (main, contrib, non-free) than its source
+ in a different archive area (main, contrib, non-free) than its source
  package or other binary packages built from the same source package.  The
  source package and any binary packages it builds must be in the same
- category of the archive.  A source package in main may only build binary
+ area of the archive.  A source package in main may only build binary
  packages in main, a source package in non-free may only build binary
  packages in non-free, and so forth.
 
diff --git a/debian/changelog b/debian/changelog
index 911db6f..c150886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,20 @@
 lintian (2.2.11) UNRELEASED; urgency=low
 
+  * Summary of tag changes:
+    + Added:
+      - section-area-mismatch
+    + Removed:
+      - section-category-mismatch
+
   * checks/binaries.desc:
     + [ADB] Extend the description of spelling-error-in-binary to mention
       that misspelt words are always output in lower case, and give some
       suggestions for finding the error oneself.  Thanks, Raphael Geissert
       and Paul Gevers.  (Closes: #526435)
+  * checks/control-file{,.desc}:
+    + [ADB] Refer to main, contrib and non-free as archive areas rather
+      than categories.
+    + [ADB] Rename section-category-mismatch to section-area-mismatch.
   * checks/fields{,.desc}:
     + [RA] Allow python << dependencies without Python-Version if the
       package depends on python-support, which doesn't use the

-- 
Debian package checker