[SCM] Debian package checker branch, master, updated. 2.1.3-24-g999c0d7

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit e797364b708a99611d64960b08b4ae81b89810a4
Author: Russ Allbery <rra@debian.org>
Date:   Mon Dec 29 17:23:14 2008 -0800

    Fix non-native packages and verbosity in t/runtests
    
    * t/runtests:
      + [RA] Correctly set up non-native packages for dpkg-source.
    
    Also only mention that the pre_build hook is running if run with the -v
    flag, since otherwise lines are more likely to wrap in a normal test
    suite run.

diff --git a/debian/changelog b/debian/changelog
index 2a11e8a..4512cc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,7 @@ lintian (2.1.4) UNRELEASED; urgency=low
       doesn't produce any tages listed in Test-Against.
     + [RA] Support finding and running all tests for or against a
       particular tag.
+    + [RA] Correctly set up non-native packages for dpkg-source.
 
  -- Russ Allbery <rra@debian.org>  Sun, 28 Dec 2008 13:02:03 -0800
 
diff --git a/t/runtests b/t/runtests
index 6bd74b2..88aa2b9 100755
--- a/t/runtests
+++ b/t/runtests
@@ -147,6 +147,17 @@ for (@tests) {
     my $tmpldir = "$testset/templates";
 
     my $is_native = ($testdata->{type} eq 'native');
+    my $orig_version = $testdata->{version};
+
+    # Strip the Debian revision off of the name of the target directory and
+    # the *.orig.tar.gz file if the package is non-native.  Otherwise, it
+    # confuses dpkg-source, which then fails to find the upstream tarball and
+    # builds a native package.
+    unless ($is_native) {
+	for ($orig_version, $pkgdir, $targetdir) {
+	    s/-[^-]+$//;
+	}
+    }
 
     print "Cleaning up and repopulating $targetdir...\n" if $debug;
     runsystem_ok("rm", "-rf", $targetdir);
@@ -160,7 +171,7 @@ for (@tests) {
 	runsystem("rm", "-f", "$targetdir/.dummy");
 	runsystem("rsync", "-rp", "$origdir/upstream/", "$targetdir/");
 	runsystem("cd $rundir && ".
-		  "tar czf ${pkg}_$testdata->{version}.orig.tar.gz $pkgdir");
+		  "tar czf ${pkg}_${orig_version}.orig.tar.gz $pkgdir");
 	runsystem("rsync", "-rp", "--exclude=debian/changelog",
 		  "$tmpldir/skel/", "$targetdir/");
 	runsystem("rsync", "-rp", "$origdir/debian/", "$targetdir/")
@@ -177,7 +188,7 @@ for (@tests) {
 	runsystem("echo >$targetdir/debian/watch");
     }
     if (-x "$origdir/pre_build") {
-	print "running pre_build hook...\n";
+	print "running pre_build hook... " if $verbose;
 	runsystem("$origdir/pre_build", $targetdir);
     }
 

-- 
Debian package checker