[SCM] Debian package checker branch, master, updated. 2.2.3-12-ga2fb940

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

The following commit has been merged in the master branch:
commit 85ad778da801f08ae8aef36a4a853166e014ecf5
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Mon Feb 9 22:14:48 2009 +0000

    Really fix epoched package versions
    
    A previous commit unfortunately oversimplified the tests and didn't
    handle versions such as 1:1-0.1

diff --git a/unpack/unpack-srcpkg-l1 b/unpack/unpack-srcpkg-l1
index b46d954..d20adeb 100755
--- a/unpack/unpack-srcpkg-l1
+++ b/unpack/unpack-srcpkg-l1
@@ -66,15 +66,16 @@ $version = $data->{'version'};
 if ($version =~ /:/) {
     $version =~ s/^(?:\d+):(.+)/$1/ or fail("bad version number '$version'");
 }
-$version =~ s/(.+)-(.*)$/$1/;
 
+my $basenamerev = $data->{'source'} . '_' . $version;
+$version =~ s/(.+)-(.*)$/$1/;
 my $basename = $data->{'source'} . '_' . $version;
 
 symlink($file,"$base_dir/dsc") or fail("cannot symlink dsc file: $!");
 for my $fs (split(/\n/,$data->{'files'})) {
   next if $fs =~ /^\s*$/o;
   my @t = split(/\s+/o,$fs);
-  $tarball = $t[2] if ($t[2] =~ /^\Q$basename\E(\.orig)?\.tar\.(gz|bz2|lzma)$/);
+  $tarball = $t[2] if ($t[2] =~ /^(\Q$basename\E\.orig|\Q$basenamerev\E)\.tar\.(gz|bz2|lzma)$/);
   symlink("$dir/$t[2]","$base_dir/$t[2]") or fail("cannot symlink file $t[2]: $!");
 }
 

-- 
Debian package checker