From: Guillem Jover <guillem@debian.org>
Date: Fri, 31 Aug 2007 01:06:02 +0000 (+0300)
Subject: Ignore XB- instead of XC- fields from control file binary package stanzas
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e94efde1ea7789c06ae4de0b1a9a0193decf2f9;p=dpkg

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 480ad25b..553b8636 100644
--- 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 ec3b5488..3b85dcb4 100644
--- 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 ba50119e..a1435e14 100755
--- 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"));
 	    }