scripts/dpkg-source.pl: fix error in error message

utils/Makefile.in: set top_builddir
Makefile.in: spell version-nr correctly
scripts/dpkg-source.pl: modify how we handle the dscformat: we now
    assume all major versions are upwards and backwards compatibly. This
    allows us to add new fields without breaking older versions of
    dpkg-source

1 files changed, 4 insertions, 3 deletions

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index af13bf57e..f7744fa88 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -494,8 +494,9 @@ if ($opmode eq 'build') {
 
     if (defined $fi{'S Format'}) {
         $dscformat=$fi{'S Format'};
-	$dscformat != "1.0" &&
+	if (not $dscformat =~ /^1\./) {
 	    &error("Unsupported format of .dsc file ($dscformat)");
+	}
     }
     $sourcepackage =~ m/[^.0-9]/ &&
         &error("dsc format contains illegal character \`$&'");
@@ -935,7 +936,7 @@ sub extracttar {
     defined($c2= fork) || &syserr("fork for tar -xkf -");
     if (!$c2) {
         chdir("$dirchdir") || &syserr("cannot chdir to \`$dirchdir' for tar extract");
-        open(STDIN,"<&GZIP") || &syserr("reopen gzip for cpio -i");
+        open(STDIN,"<&GZIP") || &syserr("reopen gzip for tar -xkf -");
         &cpiostderr;
         exec('tar','-xkf','-'); &syserr("exec tar -xkf -");
     }
@@ -966,7 +967,7 @@ sub extracttar {
 
 sub cpiostderr {
     open(STDERR,"| egrep -v '^[0-9]+ blocks\$' >&2") ||
-        &syserr("reopen stderr for cpio to grep out blocks message");
+        &syserr("reopen stderr for tar to grep out blocks message");
 }
 
 sub setfile {