Properly warn on unknown fields in dpkg-genchanges

Explicitely ignore all known fields from the control file source package
stanza in dpkg-genchanges, instead of leaving unknown fields unwarned.

diff --git a/ChangeLog b/ChangeLog
index 553b8636fe8e834ce8f7e6cdc0d454045715d0e7..5e3bf9fc17d6b5e6a00f9e23eab8f9f110ddab89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-31  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-genchanges.pl: Do not leave unknown fields unwarned
+       and explicitely ignore all known ones from control file source
+       package stanza.
+
 2007-08-30  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-genchanges.pl: Ignore XB- fields instead of XC- fields

diff --git a/debian/changelog b/debian/changelog
index 3b85dcb450be9c1ad069ae2c9f6f0203debc2f05..956dcb767f9c61f77d42a171a1e2de058aa5eb91 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ dpkg (1.14.6) UNRELEASED; urgency=low
   * Implement support for Homepage field. Closes: #142324
   * Ignore XB- fields instead of XC- fields from control file binary package
     stanzas in dpkg-genchanges.
+  * Explicitely ignore all known fields from the control file source package
+    stanza in dpkg-genchanges, instead of leaving unknown fields unwarned.
 
   [ Updated scripts translations ]
   * French (Frédéric Bothamy, Christian Perrier).

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index a1435e1454ead19801f90101fae2b5f3f978d1d2..616ee8d1210ed9a6fb070b6fe260b73da810fa4a 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -208,7 +208,10 @@ for $_ (keys %fi) {
        elsif (m/^Section$|^Priority$/i) { $sourcedefault{$_}= $v; }
        elsif (m/^Maintainer$/i) { $f{$_}= $v; }
        elsif (s/^X[BS]*C[BS]*-//i) { $f{$_}= $v; }
-       elsif (m/|^X[BS]+-|^Standards-Version$|^Homepage$/i) { }
+       elsif (m/^X[BS]+-/i ||
+              m/^Build-(Depends|Conflicts)(-Indep)?$/i ||
+              m/^(Standards-Version|Uploaders|Homepage|Origin|Bugs)$/i) {
+       }
        else { &unknown(_g('general section of control info file')); }
     } elsif (s/^C(\d+) //) {
        my $i = $1;