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

[SCM] Debian package checker branch, master, updated. 2.2.13-15-g98f0b43



The following commit has been merged in the master branch:
commit 5b85489a5e7dd9c1c16e887406f96b64841b1892
Author: Russ Allbery <rra@debian.org>
Date:   Fri Jul 24 22:02:37 2009 -0700

    Allow any package to be in section oldlibs
    
    * checks/fields{,.desc}
      + [RA] Allow any package to be in section oldlibs without triggering
        warnings.  Thanks, Rene Engelhard.  (Closes: #537606)

diff --git a/checks/fields b/checks/fields
index c3b2dd9..d8bc1f3 100644
--- a/checks/fields
+++ b/checks/fields
@@ -385,15 +385,18 @@ if (not defined $info->field('section')) {
 		tag "unknown-section", "$section" unless $known_sections{$parts[0]};
 	    }
 
-	    # Check package name <-> section.
-	    foreach my $map (@NAME_SECTION_MAPPINGS) {
-		if ($pkg =~ $map->[0]) {
-		    tag "wrong-section-according-to-package-name", "$pkg => $map->[1]"
-			unless $parts[-1] eq $map->[1];
-		    last;
-		}
+	    # Check package name <-> section.  oldlibs is a special case; let
+	    # anything go there.
+	    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]"
+					unless $parts[-1] eq $map->[1];
+				    last;
+			    }
+		    }
 	    }
-        }
+	}
 }
 
 #---- Priority
diff --git a/debian/changelog b/debian/changelog
index 4a1d994..409c8fa 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ lintian (2.2.14) unstable; urgency=low
     + [FL] packages named lib*-camlp4-dev should be in section ocaml
     + [RA] Move debian/rules parsing to check build dependencies to
       checks/rules.
+    + [RA] Allow any package to be in section oldlibs without triggering
+      warnings.  Thanks, Rene Engelhard.  (Closes: #537606)
   * checks/rules{,.desc}:
     + [RA] Moved checking of build dependencies based on programs invoked
       in debian/rules from checks/fields to here.
diff --git a/t/tests/fields-wrong-section/debian/debian/control.in b/t/tests/fields-wrong-section/debian/debian/control.in
index e71e58a..5dcb79b 100644
--- a/t/tests/fields-wrong-section/debian/debian/control.in
+++ b/t/tests/fields-wrong-section/debian/debian/control.in
@@ -134,3 +134,14 @@ Description: {$description} (GNU R)
  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.
+
+Package: lib{$srcpkg}-oldlibs-dev
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Section: oldlibs
+Description: {$description} (oldlibs)
+ Test for oldlibs section.
+ .
+ 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.

-- 
Debian package checker


Reply to: