[SCM] Debian package checker branch, master, updated. 2.5.4-97-gd377481

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

The following commit has been merged in the master branch:
commit 647b80e96ba60947e4e8dba9fe49862edbb7cedb
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jan 22 11:26:27 2012 +0100

    Removed assumption unpacked being a regular dir in some colls
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/ar-info b/collection/ar-info
index 20f99c4..a512e15 100755
--- a/collection/ar-info
+++ b/collection/ar-info
@@ -32,14 +32,16 @@ my $pkg = shift;
 my $type = shift;
 
 unlink('ar-info');
-chdir('unpacked')
-    or fail("cannot chdir to unpacked directory: $!");
 
-open(INDEX, '<', '../index')
+# Open before chdir, as unpacked may be a symlink
+open(INDEX, '<', 'index')
     or fail("cannot open index file: $!");
-open(OUT, '>', '../ar-info')
+open(OUT, '>', 'ar-info')
     or fail("cannot open ar-info file: $!");
 
+chdir('unpacked')
+    or fail("cannot chdir to unpacked directory: $!");
+
 while (<INDEX>) {
     chomp;
     next unless /\.a$/;
diff --git a/collection/md5sums b/collection/md5sums
index 316ddff..f695efc 100755
--- a/collection/md5sums
+++ b/collection/md5sums
@@ -22,6 +22,7 @@
 use strict;
 use warnings;
 
+use Cwd();
 use FileHandle;
 use lib "$ENV{'LINTIAN_ROOT'}/lib";
 use Lintian::Command qw(spawn reap);
@@ -30,17 +31,18 @@ use Util;
 ($#ARGV == 1) or fail('syntax: md5sums <pkg> <type>');
 my $pkg = shift;
 my $type = shift;
+my $dir = Cwd::cwd();
 
 unlink('md5sums');
 chdir('unpacked')
     or fail("cannot chdir to unpacked directory: $!");
 
 my %opts = ( pipe_in => FileHandle->new,
-             out => '../md5sums',
+             out => "$dir/md5sums",
              fail => 'error' );
 spawn(\%opts, ['xargs', '-0r', 'md5sum'] );
 $opts{pipe_in}->blocking(1);
-open(INDEX, '<', '../index')
+open(INDEX, '<', "$dir/index")
     or fail("cannot open index file: $!");
 while (<INDEX>) {
     next unless m/^-/;
diff --git a/debian/changelog b/debian/changelog
index da71ec1..926f9bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -89,11 +89,15 @@ lintian (2.5.5) UNRELEASED; urgency=low
     + [NT] Ignore langpack symlinks if they appear to be consistent.
       Thanks to Evan Broder for the report.  (Closes: #650793)
 
+  * collection/ar-info:
+    + [NT] Properly handle unpacked being a symlink.
   * collection/index:
     + [NT] Use Lintian::Processable::Package to determine source
       name and version.
   * collection/file-info-helper:
     + [NT] Do not open non-files when double-checking gzip files.
+  * collection/md5sums:
+    + [NT] Properly handle unpacked being a symlink.
   * collection/source-control-file{,.desc}:
     + [NT] Removed as they are no longer needed.  They have been
       replaced by a smarter Lintian::Collect.

-- 
Debian package checker