Merge pull request #27 from e9925248/master

Fix recompression case

16 files changed, 96 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'};
diff --git a/test-debtransform/1/debian.changelog b/test-debtransform/1/debian.changelog
new file mode 100644
index 0000000..624c354
--- /dev/null
+++ b/test-debtransform/1/debian.changelog
@@ -0,0 +1,24 @@
+grandorgue (0.3.0.6.10) unstable; urgency=low
+
+  * OBS build
+
+ -- Martin Koegler <mkoegler@auto.tuwien.ac.at>  Sat, 16 Jun 2012 13:08:51 +0200
+
+grandorgue (0.3.0.6.11) unstable; urgency=low
+
+  * OBS build
+
+ -- Martin Koegler <mkoegler@auto.tuwien.ac.at>  Sat, 16 Jun 2012 13:08:35 +0200
+
+grandorgue (0.3.0.6.10-1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * OBS build
+
+ -- Martin Koegler <mkoegler@auto.tuwien.ac.at>  Sat, 16 Jun 2012 11:27:19 +0200
+
+grandorgue (0.3.0.6) unstable; urgency=low
+
+  * Initial version
+
+ -- Martin Koegler <martin.koegler@chello.at>  Sun, 06 Nov 2011 19:44:04 +0100
diff --git a/test-debtransform/1/debian.empty b/test-debtransform/1/debian.empty
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test-debtransform/1/debian.empty
diff --git a/test-debtransform/1/debian.obs-version b/test-debtransform/1/debian.obs-version
new file mode 100644
index 0000000..3e61434
--- /dev/null
+++ b/test-debtransform/1/debian.obs-version
@@ -0,0 +1 @@
+Version: 0.3.0.6.1026
diff --git a/test-debtransform/1/debian.tar.gz b/test-debtransform/1/debian.tar.gz
new file mode 100644
index 0000000..484f362
--- /dev/null
+++ b/test-debtransform/1/debian.tar.gz
diff --git a/test-debtransform/1/debian1.tar.gz b/test-debtransform/1/debian1.tar.gz
new file mode 100644
index 0000000..b22b94c
--- /dev/null
+++ b/test-debtransform/1/debian1.tar.gz
diff --git a/test-debtransform/1/go.tar.gz b/test-debtransform/1/go.tar.gz
new file mode 100644
index 0000000..e991c62
--- /dev/null
+++ b/test-debtransform/1/go.tar.gz
diff --git a/test-debtransform/1/grandorgue.dsc b/test-debtransform/1/grandorgue.dsc
new file mode 100644
index 0000000..7add24f
--- /dev/null
+++ b/test-debtransform/1/grandorgue.dsc
@@ -0,0 +1,11 @@
+Format: 1.0
+Source: grandorgue
+Binary: grandorgue
+Architecture: any
+Version: 0.3.0.6.1026
+Maintainer: Martin Koegler <martin.koegler@chello.at>
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7), cdbs, cmake, gettext, po4a, libjack-jackd2-dev, libasound2-dev, libwxgtk2.8-dev, docbook-xsl, xsltproc, zip, devscripts
+DEBTRANSFORM-FILES-TAR: debian.tar.gz debian1.tar.gz
+Files: 
+ 1e0023c7fb1f19a883ec8170efeff360 2817072 grandorgue_0.3.0.6.tar.gz
diff --git a/test-debtransform/2/debian.changelog b/test-debtransform/2/debian.changelog
new file mode 100644
index 0000000..624c354
--- /dev/null
+++ b/test-debtransform/2/debian.changelog
@@ -0,0 +1,24 @@
+grandorgue (0.3.0.6.10) unstable; urgency=low
+
+  * OBS build
+
+ -- Martin Koegler <mkoegler@auto.tuwien.ac.at>  Sat, 16 Jun 2012 13:08:51 +0200
+
+grandorgue (0.3.0.6.11) unstable; urgency=low
+
+  * OBS build
+
+ -- Martin Koegler <mkoegler@auto.tuwien.ac.at>  Sat, 16 Jun 2012 13:08:35 +0200
+
+grandorgue (0.3.0.6.10-1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * OBS build
+
+ -- Martin Koegler <mkoegler@auto.tuwien.ac.at>  Sat, 16 Jun 2012 11:27:19 +0200
+
+grandorgue (0.3.0.6) unstable; urgency=low
+
+  * Initial version
+
+ -- Martin Koegler <martin.koegler@chello.at>  Sun, 06 Nov 2011 19:44:04 +0100
diff --git a/test-debtransform/2/debian.empty b/test-debtransform/2/debian.empty
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test-debtransform/2/debian.empty
diff --git a/test-debtransform/2/debian.obs-version b/test-debtransform/2/debian.obs-version
new file mode 100644
index 0000000..3e61434
--- /dev/null
+++ b/test-debtransform/2/debian.obs-version
@@ -0,0 +1 @@
+Version: 0.3.0.6.1026
diff --git a/test-debtransform/2/debian.tar.gz b/test-debtransform/2/debian.tar.gz
new file mode 100644
index 0000000..484f362
--- /dev/null
+++ b/test-debtransform/2/debian.tar.gz
diff --git a/test-debtransform/2/debian1.tar.gz b/test-debtransform/2/debian1.tar.gz
new file mode 100644
index 0000000..b22b94c
--- /dev/null
+++ b/test-debtransform/2/debian1.tar.gz
diff --git a/test-debtransform/2/go.tar.bz2 b/test-debtransform/2/go.tar.bz2
new file mode 100644
index 0000000..9d835e1
--- /dev/null
+++ b/test-debtransform/2/go.tar.bz2
diff --git a/test-debtransform/2/grandorgue.dsc b/test-debtransform/2/grandorgue.dsc
new file mode 100644
index 0000000..7add24f
--- /dev/null
+++ b/test-debtransform/2/grandorgue.dsc
@@ -0,0 +1,11 @@
+Format: 1.0
+Source: grandorgue
+Binary: grandorgue
+Architecture: any
+Version: 0.3.0.6.1026
+Maintainer: Martin Koegler <martin.koegler@chello.at>
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7), cdbs, cmake, gettext, po4a, libjack-jackd2-dev, libasound2-dev, libwxgtk2.8-dev, docbook-xsl, xsltproc, zip, devscripts
+DEBTRANSFORM-FILES-TAR: debian.tar.gz debian1.tar.gz
+Files: 
+ 1e0023c7fb1f19a883ec8170efeff360 2817072 grandorgue_0.3.0.6.tar.gz
diff --git a/test-debtransform/run.sh b/test-debtransform/run.sh
new file mode 100755
index 0000000..fde98da
--- /dev/null
+++ b/test-debtransform/run.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+function run
+{
+    rm -rf out
+    mkdir out
+    ERROR=0
+    PATH=..:$PATH ../debtransform $1 $1/$2 out || ERROR=1
+    if [ "$ERROR" != "$3" ]; then
+	echo "$1: FAIL"
+	exit 1
+    fi
+    echo "$1: OK"
+}
+
+run 1 grandorgue.dsc 0
+run 2 grandorgue.dsc 0
\ No newline at end of file