Also fix dpkg-source.pl

diff --git a/ChangeLog b/ChangeLog
index f79a2dfd85c8ebc6c070f35fc8bfef9c2027364b..00ed3c7b985df6518a244c30877441750b608531 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Fri Nov 12 01:47:24 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Correct names for build-depency names according to Bug# 49792
+  * .. and for dpkg-source.pl as well
 
 Mon Nov  8 17:45:50 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 0e8f6d91a580b4d862fb11451a577dbc388d3879..f888f867917f3f567fa27832c48373f3e6b90c0a 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -46,7 +46,7 @@ $i=100;grep($fieldimps{$_}=$i--,
           qw(Package Version Section Priority Architecture Essential
              Pre-Depends Depends Recommends Suggests Enhances Optional 
             Conflicts Replaces Provides Installed-Size Maintainer Source
-            Description Build-Depends Build-Depends-Indep  Build-Conflicts
+            Description Build-Depends Build-Depends-Indep Build-Conflicts
             Build-Conflicts-Indep Source));
 
 while (@ARGV) {

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index e15e9d7965ef905e49fecfd9cb3e9ed111a41556..5d55d02e770d0b0432b5f907338b679df5d6ae42 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -122,7 +122,7 @@ if ($opmode eq 'build') {
 #print STDERR "G key >$_< value >$v<\n";
             if (m/^Source$/) { &setsourcepackage; }
             elsif (m/^Standards-Version$|^Maintainer$/) { $f{$_}= $v; }
-           elsif (m/^Build-(Indep-)?(Depends|Conflicts)$/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)$/ || m/^X[BC]+-/i) { }
             else { &unknown('general section of control info file'); }