Correct names for build-depency names according to Bug# 49792

diff --git a/ChangeLog b/ChangeLog
index 7e3122506a4c693f3adf5a840b5dd5dc00015a8a..f79a2dfd85c8ebc6c070f35fc8bfef9c2027364b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +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
+
 Mon Nov  8 17:45:50 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Add support for enhances to dpkg and dselect. dselect doesn't

diff --git a/debian/changelog b/debian/changelog
index 17dd4b12223f78a8931a6562ec70218594bf865b..2ada5ac7623bbaca0493f3da97d6c5625c379961 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dpkg (1.4.1.20) unstable; urgency=low
+
+  * Fix mixup with Czech and Polish translations, Closes: Bug# 48986
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.4.1.19) unstable; urgency=low
 
   * Fix replaces for dpkg-dev

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index d7185abd7af5ede0183d39e0f220d65d84b8a04c..0e8f6d91a580b4d862fb11451a577dbc388d3879 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-DependsIndep  Build-Conflicts
+            Description Build-Depends Build-Depends-Indep  Build-Conflicts
             Build-Conflicts-Indep Source));
 
 while (@ARGV) {
@@ -121,7 +121,7 @@ for $_ (keys %fi) {
         if (m/^Maintainer$/) { $f{$_}=$v; }
         elsif (m/^Source$/) { &setsourcepackage; }
         elsif (s/^X[CS]*B[CS]*-//i) { $f{$_}= $v; }
-       elsif (m/^X[CS]+-|^Standards-Version$|^Build-(Indep-)?(Depends|Conflicts)$/i) { }
+       elsif (m/^X[CS]+-|^Standards-Version$|^Build-(Depends|Conflicts)(-Indep)?$/i) { }
        elsif (m/^Section$|^Priority$/) { $spdefault{$_}= $v; }
         else { &unknown('general section of control info file'); }
     } elsif (s/^C$myindex //) {