From 2188117683cadfc1db12cc1e96f1201c2d7deb3e Mon Sep 17 00:00:00 2001
From: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Date: Fri, 28 Sep 2012 08:26:44 +0200
Subject: [PATCH] Bug fix: Use files generated by compression converters

Compression converters put the tar.gz file under a different name causing
the content listing to fail. Therefore use the generated orig.tar.gz in the
output directory instead of the original file.
---
 debtransform | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/debtransform b/debtransform
index 087f5e8..714f4f9 100755
--- a/debtransform
+++ b/debtransform
@@ -280,12 +280,6 @@ if ($tarfile =~ /\.zip/) {
     system( ( "debtransformzip", "$dir/$old", "$tmptar" )) == 0 || die("cannot transform .zip to .tar.gz");
 }
 
-my $tardir = $tarfile;
-$tardir =~ s/\.orig\.tar/\.tar/;
-$tardir =~ s/\.tar.*?$//;
-my @tarfilecontent = listtar($tarfile, 0);
-my $origtarfile = { 'name', $tarfile, 'content', \@tarfilecontent, 'version', $tags->{'VERSION'}, 'tardir', $tardir};
-
 my @files;
 my $v = $version;
 $v =~ s/-[^-]*$//;
@@ -299,6 +293,13 @@ if( $tmptar ) {
 }
 push @files, addfile("$out/$ntarfile");
 
+my $tarpath = "$out/$ntarfile";
+my $tardir = $tarfile;
+$tardir =~ s/\.orig\.tar/\.tar/;
+$tardir =~ s/\.tar.*?$//;
+my @tarfilecontent = listtar($tarpath, 0);
+my $origtarfile = { 'name', $tarpath, 'content', \@tarfilecontent, 'version', $tags->{'VERSION'}, 'tardir', $tardir};
+
 open(DIFF, '>', "$out/${name}_$version.diff") || die("$out/${name}_$version.diff: $!\n");
 
 undef $changelog if $dir{'debian.changelog'};
-- 
2.7.4