From 7fd5b6d604ae9b50a340664f702e85cd235ff561 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 6 Sep 2007 05:14:11 +0300 Subject: [PATCH] Stop recognizing the obsolete Optional field when building packages --- ChangeLog | 7 +++++++ debian/changelog | 1 + scripts/dpkg-genchanges.pl | 2 +- scripts/dpkg-gencontrol.pl | 2 +- scripts/dpkg-source.pl | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc521373..acc7c3f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-09-06 Guillem Jover + + * scripts/dpkg-genchanges.pl: Stop recognizing the obsolete Optional + field. + * scripts/dpkg-gencontrol.pl: Likewise. + * scripts/dpkg-source.pl: Likewise. + 2007-09-06 Guillem Jover * scripts/dpkg-name.sh: Avoid escaped quotes messing with syntax diff --git a/debian/changelog b/debian/changelog index 5455b145..110b1176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dpkg (1.14.7) UNRELEASED; urgency=low 822-date. Closes: #440962 * Document in dpkg-scanpackages that apt now requires Packages.bz2 instead of Packages.gz. Closes: #440973 + * Stop recognizing the obsolete Optional field when building packages. [ Updated dpkg translations ] * Portuguese (Miguel Figueiredo). diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl index 7b54c47b..d17700b8 100755 --- a/scripts/dpkg-genchanges.pl +++ b/scripts/dpkg-genchanges.pl @@ -253,7 +253,7 @@ for $_ (keys %fi) { } push(@archvalues,$v) unless !$v || $archadded{$v}++; } elsif (m/^(Package|Essential|Pre-Depends|Depends|Provides)$/ || - m/^(Recommends|Suggests|Enhances|Optional|Conflicts|Breaks|Replaces)$/ || + m/^(Recommends|Suggests|Enhances|Conflicts|Breaks|Replaces)$/ || m/^Tag$/i || m/^X[BS]+-/i) { } else { diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index 414d8a69..6f9ead54 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -162,7 +162,7 @@ for $_ (keys %fi) { else { $_ = "C $_"; &unknown(_g('general section of control info file')); } } elsif (s/^C$myindex //) { #print STDERR "P key >$_< value >$v<\n"; - if (m/^(Package|Description|Homepage|Tag|Essential|Optional)$/) { + if (m/^(Package|Description|Homepage|Tag|Essential)$/) { $f{$_}= $v; } elsif (exists($pkg_dep_fields{$_})) { # Delay the parsing until later diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 5c16bc4a..898ea833 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -285,7 +285,7 @@ if ($opmode eq 'build') { } elsif (s/^X[BC]*S[BC]*-//i) { $f{$_}= $v; } elsif (m/^(Package|Essential|Pre-Depends|Depends|Provides)$/i || - m/^(Recommends|Suggests|Optional|Conflicts|Replaces)$/i || + m/^(Recommends|Suggests|Conflicts|Replaces)$/i || m/^(Breaks|Enhances|Description|Tag|Section|Priority)$/i || m/^X[BC]+-/i) { } else { -- 2.39.5