Match fields case insensitively in debian/control.

diff --git a/ChangeLog b/ChangeLog
index 7e5b8b01d6156b5256ba70f8d973562083e941fa..350fa42a2c481a833ad6bdd0e43a36d9a33d5e2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri May 24 01:10:45 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-source.pl, debian/changelog: Match fields case
+    insensitively in debian/control.
+
+Fri May 24 00:22:39 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-source.pl: Clean up after ctrl-c is received.
+
 Fri May 24 00:11:01 CDT 2002 Adam Heath <doogie@debian.org>
 
   * include/dpkg.h.in, include/myopt.h, lib/Makefile.in, lib/myopt.c,

diff --git a/debian/changelog b/debian/changelog
index 0c84aab14283812843b4b5faa44ce2700aa83180..e9c75441cfe042451dab532abe13c7bc352f5aad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,8 @@ dpkg (1.10) unstable; urgency=low
   * Always set CLOEXEC on the lock fd.  Closes: Bug#147872
   * Clean up tmp files when ctrl-c is sent to dpkg-source.  Closes:
     Bug#58653.
+  * dpkg-source no longer requires exact case matches for fields in
+    debian/control.  Closes: Bug#139159.
 
  -- Wichert Akkerman <wakkerma@debian.org>  Mon, 20 Aug 2001 14:54:38 +0200
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 5645959e364dd7ca9faa45021d349e1177193b1f..967c2bc8ba08c1bd121de2a4a9828984b851295e 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -150,11 +150,11 @@ if ($opmode eq 'build') {
     for $_ (keys %fi) {
         $v= $fi{$_};
         if (s/^C //) {
-            if (m/^Source$/) { &setsourcepackage; }
-            elsif (m/^(Standards-Version|Origin|Maintainer|Uploaders)$/) { $f{$_}= $v; }
+            if (m/^Source$/i) { &setsourcepackage; }
+            elsif (m/^(Standards-Version|Origin|Maintainer|Uploaders)$/i) { $f{$_}= $v; }
            elsif (m/^Build-(Depends|Conflicts)(-Indep)?$/i) { $f{$_}= $v; }
             elsif (s/^X[BC]*S[BC]*-//i) { $f{$_}= $v; }
-            elsif (m/^(Section|Priority|Files|Bugs)$/ || m/^X[BC]+-/i) { }
+            elsif (m/^(Section|Priority|Files|Bugs)$/i || m/^X[BC]+-/i) { }
             else { &unknown('general section of control info file'); }
         } elsif (s/^C(\d+) //) {
             $i=$1; $p=$fi{"C$i Package"};
@@ -183,9 +183,9 @@ if ($opmode eq 'build') {
                 $f{'Architecture'}= join(' ',@sourcearch);
             } elsif (s/^X[BC]*S[BC]*-//i) {
                 $f{$_}= $v;
-            } elsif (m/^(Package|Essential|Pre-Depends|Depends|Provides)$/ ||
-                     m/^(Recommends|Suggests|Optional|Conflicts|Replaces)$/ ||
-                     m/^(Description|Section|Priority)$/ ||
+            } elsif (m/^(Package|Essential|Pre-Depends|Depends|Provides)$/i ||
+                     m/^(Recommends|Suggests|Optional|Conflicts|Replaces)$/i ||
+                     m/^(Description|Section|Priority)$/i ||
                      m/^X[CS]+-/i) {
             } else {
                 &unknown("package's section of control info file");
@@ -197,7 +197,7 @@ if ($opmode eq 'build') {
                 $f{$_}= $v;
             } elsif (s/^X[BS]*C[BS]*-//i) {
                 $f{$_}= $v;
-            } elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes)$/ ||
+            } elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes)$/i ||
                      m/^X[BS]+-/i) {
             } else {
                 &unknown("parsed version of changelog");