[SCM] Debian package checker branch, master, updated. 2.5.13-12-g6f4bd2f

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

The following commit has been merged in the master branch:
commit baca1b3fe2e1cbe21df48fadb3965134fbc34526
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jun 12 09:48:19 2013 +0200

    c/cruft: Stop relying on file(1) on (partial) text files
    
    While there is nothing wrong with relying on file(1), the "ascii" test
    in file(1) is fairly expensive.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft b/checks/cruft
index f25dcf3..2c07cc8 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -161,41 +161,35 @@ for my $file ($info->sorted_index) {
     } elsif ($file_info =~ m/\b(?:PE(?:32|64)|(?:MS-DOS|COFF) executable)\b/) {
         tag 'source-contains-prebuilt-windows-binary', $file;
     } elsif ($file =~ /\bwaf$/) {
-        my $ok = 1;
-        # If file believes this is data, then we trust that
-        $ok = 0 if $file_info =~ m/data/;
-        if ($ok) {
-            # Unfortunately file 5.04 (Squeeze) and 5.09 does not
-            # always agree, so manually check for the bz2 entry if
-            # file does not declare it as "data".
-            my $path = $info->unpacked ($file);
-            my $marker = 0;
-            next unless -f $path and not -l $path;
-            open(my $fd, '<', $path);
-            while ( my $line = <$fd> ) {
-                next unless $line =~ m/^#/o;
-                if ($marker && $line =~ m/^#BZ[h0][0-9]/o) {
-                    $ok = 0;
-                    last;
-                }
-                $marker = 1 if $line =~ m/^#==>/o;
-                # We could probably stop here, but just in case
-                $marker = 0 if $line =~ m/^#<==/o;
+        my $path = $info->unpacked($file);
+        my $marker = 0;
+        next unless -f $path and is_ancestor_of($uroot, $path);
+        open(my $fd, '<', $path);
+        while ( my $line = <$fd> ) {
+            next unless $line =~ m/^#/o;
+            if ($marker && $line =~ m/^#BZ[h0][0-9]/o) {
+                tag 'source-contains-waf-binary', $file;
+                last;
             }
-            close($fd);
+            $marker = 1 if $line =~ m/^#==>/o;
+            # We could probably stop here, but just in case
+            $marker = 0 if $line =~ m/^#<==/o;
         }
-        tag 'source-contains-waf-binary', $file unless $ok;
+        close($fd);
     }
 }
 
 for my $file (@EOL_TERMINATORS_FILES) {
-    $file = "debian/$file";
-    my $file_info = $info->file_info ($file);
-    next unless defined $file_info;
-
-
-    tag 'control-file-with-CRLF-EOLs', $file
-        if $file_info =~ m/\bCRLF\b/;
+    my $path = $info->debfiles($file);
+    next if not -f $path or not is_ancestor_of($droot, $path);
+    open(my $fd, '<', $path);
+    while (my $line = <$fd>) {
+        if ($line =~ m{ \r \n \Z}xsm) {
+            tag 'control-file-with-CRLF-EOLs', "debian/$file";
+            last;
+        }
+    }
+    close($fd);
 }
 
 # Report any error messages from tar while unpacking the source package if it
diff --git a/debian/changelog b/debian/changelog
index 6f26854..51b179c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 lintian (2.5.14) UNRELEASED; urgency=low
 
+  * checks/cruft:
+    + [NT] Revise a few tests that relied on file(1) on text files.
   * checks/fields.desc:
     + [NT] Fix typo, thanks to Adrien Cunin.
 

-- 
Debian package checker