[SCM] Debian package checker branch, master, updated. 2.3.3-4-gb29e23e

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

The following commit has been merged in the master branch:
commit b29e23e5f40113fae1e0b186391db37334a31e95
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Mon Feb 15 15:11:13 2010 -0600

    Use the nul character as the delimiter of file(1)

diff --git a/collection/file-info b/collection/file-info
index b40d9a9..c152f42 100755
--- a/collection/file-info
+++ b/collection/file-info
@@ -43,7 +43,7 @@ chdir("unpacked")
 my %opts = ( pipe_in => FileHandle->new,
 	     out => '../file-info',
 	     fail => 'never' );
-spawn(\%opts, ['xargs', '-0r', 'file', '--']);
+spawn(\%opts, ['xargs', '-0r', 'file', '-F', '', '--print0', '--']);
 $opts{pipe_in}->blocking(1);
 open(INDEX, '<', "../index")
     or fail("cannot open index file: $!");
diff --git a/collection/objdump-info b/collection/objdump-info
index 2ad5feb..c6d6313 100755
--- a/collection/objdump-info
+++ b/collection/objdump-info
@@ -49,7 +49,7 @@ chdir ("unpacked")
     or fail ("unable to chdir to unpacked: $!\n");
 
 while (<FILES>) {
-    if (m/^(.+?):\s.*ELF/) {
+    if (m/^(.+?)\x00\s.*ELF/) {
 	my $bin = $1;
 
 	print OUT "-- $bin\n";
diff --git a/collection/strings b/collection/strings
index 5a903c4..eac96ca 100755
--- a/collection/strings
+++ b/collection/strings
@@ -27,7 +27,7 @@
 [ ! -f elf-index ] || rm -f elf-index
 exec >elf-index
 
-for bin in $(sed -rn 's/:\s+[^,]*\bELF\b.+$//g;T;p' file-info); do
+for bin in $(sed -rn 's/\x00\s+[^,]*\bELF\b.+$//g;T;p' file-info); do
     echo "$bin"
     case $bin in
       /usr/lib/debug/*)
diff --git a/lib/Lintian/Collect/Binary.pm b/lib/Lintian/Collect/Binary.pm
index cde9edd..1d2d6d6 100644
--- a/lib/Lintian/Collect/Binary.pm
+++ b/lib/Lintian/Collect/Binary.pm
@@ -134,7 +134,7 @@ sub file_info {
     while (<$idx>) {
         chomp;
 
-        m/^(.+?):\s+(.*)$/o
+        m/^(.+?)\x00\s+(.*)$/o
             or fail("an error in the file pkg is preventing lintian from checking this package: $_");
         my ($file, $info) = ($1,$2);
 
diff --git a/lib/Lintian/Collect/Source.pm b/lib/Lintian/Collect/Source.pm
index 20485e9..2a30ff6 100644
--- a/lib/Lintian/Collect/Source.pm
+++ b/lib/Lintian/Collect/Source.pm
@@ -156,7 +156,7 @@ sub file_info {
     open(my $idx, '<', "file-info") or fail("cannot open file-info: $!");
     while (<$idx>) {
         chomp;
-        m/^(.+?):\s+(.*)$/o or fail("cannot parse file output: $_");
+        m/^(.+?)\x00\s+(.*)$/o or fail("cannot parse file output: $_");
         my ($file, $info) = ($1,$2);
         $file =~ s,^\./,,o;
         $file =~ s,/+$,,o;

-- 
Debian package checker