The following commit has been merged in the master branch:
commit d0834fbab3b8814e2ceb10c6934ba361da9fb377
Author: Raphael Geissert <[email protected]>
Date:   Sun Feb 20 15:25:20 2011 -0600

    Include the package's area in the wrong-section tag
    
    * checks/fields{,.desc}:
      + [RG] Mention the package's original area in
        wrong-section-according-to-package-name.  (Closes: #608554)

diff --git a/checks/fields b/checks/fields
index b94b6c1..0a6a9a6 100644
--- a/checks/fields
+++ b/checks/fields
@@ -438,7 +438,9 @@ if (not defined $info->field('section')) {
            if ($parts[-1] ne 'oldlibs') {
                    foreach my $map (@NAME_SECTION_MAPPINGS) {
                            if ($pkg =~ $map->[0]) {
-                                   tag 
'wrong-section-according-to-package-name', "$pkg => $map->[1]"
+                                   my $area = '';
+                                   $area = "$parts[0]/" if (scalar @parts == 
2);
+                                   tag 
'wrong-section-according-to-package-name', "$pkg => ${area}$map->[1]"
                                        unless $parts[-1] eq $map->[1];
                                    last;
                            }
diff --git a/debian/changelog b/debian/changelog
index 69057fe..4a7c5c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,8 @@ lintian (2.5.0) UNRELEASED; urgency=low
       triggered if dh_python2 is used and the package is missing
       ${python:Breaks}. Thanks to Piotr Ożarowski for the report.
       (Closes: #604167)
+    + [RG] Mention the package's original area in
+      wrong-section-according-to-package-name.  (Closes: #608554)
   * checks/files{,.desc}:
     + [NT] Fixed false-positive extra-license-file for license.ui files.
       Thanks to Jeremy Sanders for the report.  (Closes: #595941)
diff --git a/t/tests/fields-wrong-section/debian/debian/control.in 
b/t/tests/fields-wrong-section/debian/debian/control.in
index 2a562e3..4a3c1cd 100644
--- a/t/tests/fields-wrong-section/debian/debian/control.in
+++ b/t/tests/fields-wrong-section/debian/debian/control.in
@@ -159,3 +159,15 @@ Description: {$description} (oldlibs)
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.  It may
  be an empty package.
+
+Package: {$srcpkg}-contrib-doc
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Section: contrib/{$section}
+Description: {$description} (contrib docs)
+ Test for suggestion for packages not in main.
+ .
+ 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
+ things.  It should not be installed like a regular package.  It may
+ be an empty package.
diff --git a/t/tests/fields-wrong-section/tags 
b/t/tests/fields-wrong-section/tags
index 5d961be..069aeed 100644
--- a/t/tests/fields-wrong-section/tags
+++ b/t/tests/fields-wrong-section/tags
@@ -1,3 +1,4 @@
+W: fields-wrong-section-contrib-doc: wrong-section-according-to-package-name 
fields-wrong-section-contrib-doc => contrib/doc
 W: fields-wrong-section-dbg: wrong-section-according-to-package-name 
fields-wrong-section-dbg => debug
 W: fields-wrong-section-doc: wrong-section-according-to-package-name 
fields-wrong-section-doc => doc
 W: libfields-wrong-section-cil: wrong-section-according-to-package-name 
libfields-wrong-section-cil => cli-mono

-- 
Debian package checker


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to