From d69a6a3958fb0b5fd8223509a039f824a15e40b8 Mon Sep 17 00:00:00 2001 From: joeyh Date: Wed, 3 Oct 2007 03:35:39 +0000 Subject: [PATCH] other half of fix --- debian/changelog | 4 ++-- pristine-tar | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6ef86a..6c08d40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,9 @@ pristine-tar (0.3) UNRELEASED; urgency=low * pristine-tar sometimes got confused about tarballs that did not unpack all files into a subdir. Fixes sear-media and 18 others. * tar was confused by ./ in the manifest, so strip it out. Fixes - erlang-doc-html. + erlang-doc-html and 18 others. - -- Joey Hess Tue, 02 Oct 2007 23:13:08 -0400 + -- Joey Hess Tue, 02 Oct 2007 23:35:02 -0400 pristine-tar (0.2) unstable; urgency=low diff --git a/pristine-tar b/pristine-tar index cd94a0e..a4d29d8 100755 --- a/pristine-tar +++ b/pristine-tar @@ -116,11 +116,12 @@ sub gentarball { # The manifest and source should have the same filenames, # but the manifest probably has all the files under a common # subdirectory. Check if it does. - # XXX currently only zero or one subdirectory level is supported my $subdir=""; foreach my $file (@manifest) { if ($file=~m!^(/?[^/]+)/!) { if (length $subdir && $subdir ne $1) { + debug("found file not in subdir $subdir: $file"); + $subdir=""; last; } elsif (! length $subdir) { -- 2.7.4