[SCM] Debian package checker branch, master, updated. 2.5.11-142-g4d4d95d

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 4d4d95dba096c2aa3e13ae5280ef927b96e15334
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Feb 8 14:10:33 2013 +0100

    Skip certain tags for metapackages
    
    Skip extended-description-is-probably-too-short,
    depends-on-packaging-dev and empty-binary-package for metapackages
    (Section: metapackages, transtional packages etc.).
    
    Technically, depends-on-packaging should not be omitted for
    transitional packages, but it seems unlikely to occur by chance.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/description b/checks/description
index 3dc0ad9..d6385bd 100644
--- a/checks/description
+++ b/checks/description
@@ -172,7 +172,8 @@ if ($type ne 'udeb') {
     if ($lines == 0) {
         tag 'extended-description-is-empty';
     } elsif ($lines <= 2 and not $synopsis =~ /(dummy|transition)/i) {
-        tag 'extended-description-is-probably-too-short';
+        tag 'extended-description-is-probably-too-short'
+            unless $info->is_pkg_class ('any-meta');
     } elsif ($description =~ /^ \.\s*\n|\n \.\s*\n \.\s*\n|\n \.\s*\n?$/) {
         tag 'extended-description-contains-empty-paragraph';
     }
diff --git a/checks/fields b/checks/fields
index 88352ed..e702f71 100644
--- a/checks/fields
+++ b/checks/fields
@@ -686,7 +686,8 @@ if (($type eq 'binary') || ($type eq 'udeb')) {
                     if ($field =~ /^(pre-)?depends$/ && $d_pkg =~ /^xfont.*/ && $d_pkg ne 'xfonts-utils' && $d_pkg ne 'xfonts-encodings');
 
                 tag 'depends-on-packaging-dev', $field
-                    if (($field =~ /^(?:pre-)?depends$/ || $field eq 'recommends') && $d_pkg eq 'packaging-dev');
+                    if (($field =~ /^(?:pre-)?depends$/ || $field eq 'recommends') && $d_pkg eq 'packaging-dev'
+                        && not $info->is_pkg_class ('any-meta'));
 
                 tag 'needlessly-depends-on-awk', $field
                     if ($d_pkg eq 'awk' && ! $d_version->[0] && &$is_dep_field($field) && $pkg ne 'base-files');
diff --git a/debian/changelog b/debian/changelog
index 8a82526..d073207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,12 +40,17 @@ lintian (2.5.12) UNRELEASED; urgency=low
       non-free packages.
     + [NT] Apply patch from Bastien Roucariès to catch GFDL
       licenses with invariants (etc.).  (Closes: #695967)
+  * checks/description:
+    + [NT] Ignore "extended-description-is-probably-too-short"
+      for metapackages.  Thanks to Axel Beckert for the
+      report.
   * checks/fields{,.desc}:
     + [NT] Apply patch from Samuel Bronson to detect some
       broken or poor Vcs URLs.  Also thanks to James McCoy for
       his report.  (Closes: #652595)
     + [JW] Reduce severity of b-d-on-python-dev-with-no-arch-any
       to minor.
+    + [NT] Skip "depends-on-packaging-dev" for metapackages.
   * checks/files{,.desc}:
     + [NT] Apply patch from Bastien Roucariès to catch paths
       in (common) build dirs.  (Closes: #678857)
@@ -154,6 +159,9 @@ lintian (2.5.12) UNRELEASED; urgency=low
     + [NT] Re-instate the "TEXTREL" marker.  This fixes a regression
       where shared-libs compiled without pic was not reported.
       Thanks to Dmitry Shachnev for the assistance in debugging this.
+    + [NT] Recognise packages in section "metapackages" as a
+      metapackage.  Thanks to Axel Beckert for the report.
+      (Closes: #698610)
   * lib/Lintian/Command/Simple.pm:
     + [NT] Use constant time lookup access instead of linear scan with
       "hashref" wait.
diff --git a/lib/Lintian/Collect/Binary.pm b/lib/Lintian/Collect/Binary.pm
index f4e2987..95aec33 100644
--- a/lib/Lintian/Collect/Binary.pm
+++ b/lib/Lintian/Collect/Binary.pm
@@ -614,7 +614,8 @@ Needs-Info requirements for using I<is_pkg_class>: L<Same as field|Lintian::Coll
         if ($pkg_class eq 'any-meta') {
             my ($section) = $self->field ('section', '');
             return 1 if $desc =~ m/$METAPKG_REGEX/o;
-            return 1 if $section =~ m,(?:^|/)tasks$,;
+            # Section "tasks" or "metapackages" qualifies as well
+            return 1 if $section =~ m,(?:^|/)(?:tasks|metapackages)$,;
             return 1 if $self->name =~ m/^task-/;
         }
         return;
diff --git a/t/tests/fields-depends-general/debian/debian/control.in b/t/tests/fields-depends-general/debian/debian/control.in
index 08e7507..7f78bfd 100644
--- a/t/tests/fields-depends-general/debian/debian/control.in
+++ b/t/tests/fields-depends-general/debian/debian/control.in
@@ -18,8 +18,7 @@ Conflicts: package-with-version (<< 3.0), conflict-dep
 Description: {$description}
  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.
+ things.  It should not be installed like a regular package.
 
 Package: lib{$srcpkg}
 Architecture: {$architecture}

-- 
Debian package checker