Stop recognizing the obsolete Optional field when building packages

diff --git a/ChangeLog b/ChangeLog
index cc5213731dbd08143b9ea4714148b871709d75ee..acc7c3f8d073657454eff0366b4cff2b021a582d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-06  Guillem Jover  <guillem@debian.org>
+
+       * 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  <guillem@debian.org>
 
        * scripts/dpkg-name.sh: Avoid escaped quotes messing with syntax

diff --git a/debian/changelog b/debian/changelog
index 5455b1459834039195829c263d53744d89d708f0..110b117625defd31add7d3674e07861eddd9848c 100644 (file)
--- 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 7b54c47bf4a0c6a10179f006304098465676b7c4..d17700b881ff843bfcb49ebdd4ac1a0b4125154e 100755 (executable)
--- 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 414d8a6986232a3f550750416031ffb104c12d82..6f9ead54626a13b907c04d2ae087b5c3d501e6a7 100755 (executable)
--- 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 5c16bc4ae37772ca8ba2236e810970d43de76e5d..898ea833e37dfd0e6cb7428279a8f433a71c03e4 100755 (executable)
--- 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 {