Stop recognizing the obsolete Optional field when building packages

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

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).

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 {

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

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 {