From e84a503cf035df549f69b8d463442e3f7719a95a Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Fri, 12 Nov 1999 00:49:24 +0000 Subject: [PATCH] Correct names for build-depency names according to Bug# 49792 --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ scripts/dpkg-gencontrol.pl | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e312250..f79a2dfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Nov 12 01:47:24 CET 1999 Wichert Akkerman + + * Correct names for build-depency names according to Bug# 49792 + Mon Nov 8 17:45:50 CET 1999 Wichert Akkerman * Add support for enhances to dpkg and dselect. dselect doesn't diff --git a/debian/changelog b/debian/changelog index 17dd4b12..2ada5ac7 100644 --- 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 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 d7185abd..0e8f6d91 100755 --- 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 //) { -- 2.39.5