[SCM] Debian package checker branch, master, updated. 2.4.3-236-gf4a7cfc

["Raphael Geissert" <atomo64@gmail.com>]

The following commit has been merged in the master branch:
commit c364b9774ec1b41dbc18fcb15255a8200af582ed
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Fri Feb 18 20:29:57 2011 -0600

    Use Collect::Binary::index to find directories instead of ::file_info
    
    This is mainly for lintian.d.o, but it is better not to rely on
    file(1)'s output for things we can know for sure from other sources.
    
    * checks/binaries:
      + [RG] Find directories based on the file's type instead of file(1)'s
        unforgiving ouput.  Thanks, Gabriele Giacone.  (Closes: #597990)

diff --git a/checks/binaries b/checks/binaries
index 5cc58b9..6b6db59 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -211,10 +211,11 @@ tag 'package-name-doesnt-match-sonames', "@sonames"
     if @sonames && !$match_found;
 
 my %directories;
-foreach (@{$info->sorted_file_info}) {
+foreach (@{$info->sorted_index}) {
     next unless length $_;
-    my $data = $info->file_info->{$_};
-    next unless $data eq 'directory' or $data =~ / link to /;
+    my $ftype = $info->index->{$_}->{'type'};
+    next unless ($ftype eq 'd' || $ftype eq 'l');
+    s,/\z,,;
     $directories{"/$_"}++;
 }
 
diff --git a/debian/changelog b/debian/changelog
index 7f9f34c..1eb162e 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ lintian (2.5.0) UNRELEASED; urgency=low
       libmsn, libmikmod, libmysqlclient, and tinyxml.
     + [RG] Merge embedded-{zlib,lib{png,jpeg,openjpeg}} into
       embedded-library.
+    + [RG] Find directories based on the file's type instead of file(1)'s
+      unforgiving ouput.  Thanks, Gabriele Giacone.  (Closes: #597990)
   * checks/cruft{,.desc}:
     + [NT] Extended the diff-contains-substvars check to also catch files
       prefixed with a package name.

-- 
Debian package checker