From 84adee07042d3ab991338a132047c56eae56c5aa Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Fri, 24 May 2002 06:16:49 +0000 Subject: [PATCH] Match fields case insensitively in debian/control. --- ChangeLog | 9 +++++++++ debian/changelog | 2 ++ scripts/dpkg-source.pl | 14 +++++++------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e5b8b01..350fa42a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri May 24 01:10:45 CDT 2002 Adam Heath + + * scripts/dpkg-source.pl, debian/changelog: Match fields case + insensitively in debian/control. + +Fri May 24 00:22:39 CDT 2002 Adam Heath + + * scripts/dpkg-source.pl: Clean up after ctrl-c is received. + Fri May 24 00:11:01 CDT 2002 Adam Heath * include/dpkg.h.in, include/myopt.h, lib/Makefile.in, lib/myopt.c, diff --git a/debian/changelog b/debian/changelog index 0c84aab1..e9c75441 100644 --- 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 Mon, 20 Aug 2001 14:54:38 +0200 diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 5645959e..967c2bc8 100755 --- 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"); -- 2.39.5