Ignore XB- instead of XC- fields from control file binary package stanzas

dpkg-genchanges was wrongly trying to ignore XC- fields (which was a no-op,
those being handled already) when it should have been ignoring XB-.

diff --git a/ChangeLog b/ChangeLog
index 480ad25b54e296bc23d9998b1dd1d0c9f7e4107a..553b8636fe8e834ce8f7e6cdc0d454045715d0e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-30  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-genchanges.pl: Ignore XB- fields instead of XC- fields
+       from control file binary package stanzas.
+
 2007-08-28  Guillem Jover  <guillem@debian.org>
 
        * scripts/update-alternatives.pl: Fix regression introduced on commit

diff --git a/debian/changelog b/debian/changelog
index ec3b54881a535414c4e64a3f063ddb3bc1f389a7..3b85dcb450be9c1ad069ae2c9f6f0203debc2f05 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ dpkg (1.14.6) UNRELEASED; urgency=low
   * Fix perl warnings:
     - When removing a non diverted file with dpkg-divert. Closes: #438416
   * Implement support for Homepage field. Closes: #142324
+  * Ignore XB- fields instead of XC- fields from control file binary package
+    stanzas in dpkg-genchanges.
 
   [ Updated scripts translations ]
   * French (Frédéric Bothamy, Christian Perrier).

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index ba50119e68ba9e02642a6fe8693aef37a37b135b..a1435e1454ead19801f90101fae2b5f3f978d1d2 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -252,7 +252,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/^X[CS]+-/i) {
+                    m/^X[BS]+-/i) {
            } else {
                &unknown(_g("package's section of control info file"));
            }