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

diff --git a/ChangeLog b/ChangeLog
index c2722acae22e0f2f109906d8548b3b5afd3c868f..fc802bd9a53f5c39359eb26c1703732915e90707 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Feb  1 18:22:05 EST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-source.pl: fix error in error message
+  * utils/Makefile.in: set top_builddir
+  * Makefile.in: spell version-nr correctly
+
+Sun Jan 28 22:38:02 EST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * 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
+
 Sun Jan 21 20:09:36 SGT 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-divert.pl: only allow absolute filenames

diff --git a/Makefile.in b/Makefile.in
index 44b11df40afd9e0e6f313c8b3942c9487ada1b9b..3f9bece3584376be45e6048c02b34ea3307fd511 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
-VERSION                = $(shell cat verion-nr)
+VERSION                = $(shell cat version-nr)
 
 GENFILES       = version.h
 

diff --git a/debian/changelog b/debian/changelog
index a5f65bb9941bbfdc353e1c651f27fd41997a6612..a3f139f130b8f398e11a6f285293234886b95fe3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ dpkg (1.9.0) unstable; urgency=low
     optlib, for non-GNU systems.
   * dpkg-divert only allows absolute filenames now. Closes: Bug#82419
   * Handle diffs from non-existing files to existing files. Closes: Bug#82708
+  * Small fixes to the buildsystem. Closes: Bug#84361
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index af13bf57e5a8203d7f4e122a6559bbd17c7c5cf1..f7744fa88e776063b4f7d9d4ffb9b19743a3facf 100755 (executable)
--- 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 {

diff --git a/utils/Makefile.in b/utils/Makefile.in
index aca2e4829b9e61e275af499838641cf09d41b342..fd0d785bfe4f3e63c1255fee184129245196c2f8 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -2,6 +2,7 @@
 VPATH          = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
+top_builddir   = ..
 
 include ../Makefile.conf