[SCM] Debian package checker branch, master, updated. 2.5.6-135-g2a67da7

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

The following commit has been merged in the master branch:
commit 2a67da76e32811c50cc01fdb81507b308ef2f9d5
Author: Niels Thykier <niels@thykier.net>
Date:   Sun May 13 20:38:58 2012 +0200

    c/infofiles: Drop missing-dependency-on-install-info
    
    The dependency "dpkg (>= 1.15.4) | install-info" is satisfied by
    dpkg in Debian/Lenny and Ubuntu/Natty.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/infofiles b/checks/infofiles
index 6755fbd..e75dcea 100644
--- a/checks/infofiles
+++ b/checks/infofiles
@@ -34,8 +34,6 @@ my $pkg = shift;
 my $type = shift;
 my $info = shift;
 
-my $has_info_file;
-
 # Read package contents...
 foreach my $file (@{$info->sorted_index}) {
     my $index_info = $info->index->{$file};
@@ -50,9 +48,6 @@ foreach my $file (@{$info->sorted_index}) {
     # the files check.
     next if $fname =~ /^dir(?:\.old)?(?:\.gz)?/;
 
-    # Note that this package contains at least one info file.
-    $has_info_file = 1;
-
     # Analyze the file names making sure the documents are named properly.
     # Note that Emacs 22 added support for images in info files, so we have to
     # accept those and ignore them.  Just ignore .png files for now.
@@ -107,16 +102,6 @@ foreach my $file (@{$info->sorted_index}) {
     }
 }
 
-# If there's at least one info file in the package, the package should depend
-# on dpkg (>= 1.15.4) | install-info to ensure the dir file is properly
-# handled on partial upgrades.
-if ($has_info_file) {
-    my $depends = $info->relation('depends');
-    unless ($depends->implies('dpkg (>= 1.15.4) | install-info')) {
-        tag 'missing-dependency-on-install-info';
-    }
-}
-
 }
 
 1;
diff --git a/checks/infofiles.desc b/checks/infofiles.desc
index e323772..b112993 100644
--- a/checks/infofiles.desc
+++ b/checks/infofiles.desc
@@ -61,12 +61,3 @@ Info: This info document has no directory entry.  This is text between
  appropriate entry.  You will have to ensure that the build process builds
  new info files rather than using ones built by upstream.
 
-Tag: missing-dependency-on-install-info
-Severity: normal
-Certainty: possible
-Info: This package appears to contain at least one info document but does
- not depend on <tt>dpkg (>= 1.15.4) | install-info</tt> as recommended by
- Policy.  This dependency is needed for the transition to triggerized
- install-info to correctly build the info directory during partial
- upgrades from lenny.
-Ref: policy 12.2
diff --git a/debian/changelog b/debian/changelog
index 497db4c..10771c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ lintian (2.5.7) UNRELEASED; urgency=low
       - duplicate-fields-in-templates
       - manpage-for-non-x11-binary-in-wrong-directory
       - manpage-for-x11-binary-in-wrong-directory
+      - missing-dependency-on-install-info
       - obsolete-field
       - old-app-defaults-directory
       - old-style-copyright-file
diff --git a/t/tests/infofiles-general/desc b/t/tests/infofiles-general/desc
index d4c7b20..69b01f6 100644
--- a/t/tests/infofiles-general/desc
+++ b/t/tests/infofiles-general/desc
@@ -9,5 +9,4 @@ Test-For:
  info-document-not-compressed
  info-document-not-compressed-with-gzip
  info-document-not-compressed-with-max-compression
- missing-dependency-on-install-info
 References: Bug#534640
diff --git a/t/tests/infofiles-general/tags b/t/tests/infofiles-general/tags
index 8c86f08..96a28fc 100644
--- a/t/tests/infofiles-general/tags
+++ b/t/tests/infofiles-general/tags
@@ -7,4 +7,3 @@ E: infofiles-general: info-document-not-compressed-with-gzip usr/share/info/foo-
 E: infofiles-general: info-document-not-compressed-with-max-compression usr/share/info/foo-nomax.gz
 W: infofiles-general: gz-file-not-gzip usr/share/info/foo-nogz.gz
 W: infofiles-general: info-document-has-wrong-extension usr/share/info/bar.newinfo.gz
-W: infofiles-general: missing-dependency-on-install-info

-- 
Debian package checker