[SCM] Debian package checker branch, master, updated. 2.2.5-39-g5edaf45

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

The following commit has been merged in the master branch:
commit 5edaf453b457a52e35b256e216df28e2acd43d53
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Sat Feb 21 23:25:05 2009 +0000

    Support yet another form of source tarball layout
    
    Sometimes the root directory of the tarball is simply "directory"
    rather than "directory/".  We convert it to the latter form before
    continuing with the existing processing.

diff --git a/unpack/unpack-srcpkg-l1 b/unpack/unpack-srcpkg-l1
index fdcf9a6..6c80664 100755
--- a/unpack/unpack-srcpkg-l1
+++ b/unpack/unpack-srcpkg-l1
@@ -92,6 +92,7 @@ if ($tarball =~ /\.lzma\z/) {
 spawn({ fail => 'error', out => "$base_dir/index" },
       ["tar", @tar_options, "$base_dir/$tarball"],
       '|', ['perl', '-p -w -E', 's,^(\S+\s+){5}\./$,,;',
+		'-E', 's,^((\S+\s+){5})[^/]+$,$0/,;',
 		'-E', 's,^((\S+\s+){5})(\./)?[^/]+,$1.,;s,^h,-,'],
       '|', ['awk', '/^.+$/ {print $0}'],
       '|', ["sort", "-k", "6"]);

-- 
Debian package checker