r371: * Modified to allow no spaces between control file field name and value

     (this appears to be logal).

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 42d4097414154c8453f68bc9b96aa30014cad4d4..e71895e4d19a11e450698f1a0b3ecf0852ff0e9a 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -271,7 +271,7 @@ sub pkgext { my $package=shift;
 
                        # Get the package version.
                        my $version=`dpkg-parsechangelog -l$isnative_changelog`;
-                       ($dh{VERSION})=$version=~m/Version: (.*)/m;
+                       ($dh{VERSION})=$version=~m/Version:\s*(.*)/m;
 
                        # Did the changelog parse fail?
                        if (! defined $dh{VERSION}) {
@@ -371,10 +371,10 @@ sub GetPackages { my $type=shift;
        while (<CONTROL>) {
                chomp;
                s/\s+$//;
-               if (/^Package:\s+(.*)/) {
+               if (/^Package:\s*(.*)/) {
                        $package=$1;
                }
-               if (/^Architecture:\s+(.*)/) {
+               if (/^Architecture:\s*(.*)/) {
                        $arch=$1;
                }
                if (!$_ or eof) { # end of stanza.

diff --git a/debian/changelog b/debian/changelog
index 9b2bb0c00f17930684da3507536ecabd8bdd020f..5109994cde7e9abfd54141a378cf312275ea2df7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (2.1.10) unstable; urgency=low
+
+  * Modified to allow no spaces between control file field name and value
+    (this appears to be logal).
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 19 Sep 2000 23:13:17 -0700
+
 debhelper (2.1.9) unstable; urgency=low
 
   * dh_installmodules: corrected the code added to maintainer scripts so it