[SCM] Debian package checker branch, master, updated. 2.2.12-19-g6959b6d

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 6959b6dd8202e7fc662deac7e18e7d13e9e1d310
Author: Russ Allbery <rra@debian.org>
Date:   Fri Jun 26 19:19:00 2009 -0700

    Fix missing-separator-between-items with arch lists
    
    The architecture list can contain things that look like packages separated
    by spaces, so we have to remove any architecture restrictions first.  This
    unfortunately distorts our report a little, but hopefully not too much.

diff --git a/checks/control-file b/checks/control-file
index 9379992..c5b40fd 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -101,6 +101,10 @@ for my $binary_control (@binary_controls) {
 # least one of them expands to an empty string, there will be a lurking bug.
 # The result will be syntactically correct, but as soon as both expand into
 # something non-empty, there will be a syntax error.
+#
+# The architecture list can contain things that look like packages separated
+# by spaces, so we have to remove any architecture restrictions first.  This
+# unfortunately distorts our report a little, but hopefully not too much.
 for my $control ($header, @binary_controls) {
 	for my $field (qw(pre-depends depends recommends suggests breaks
 			  conflicts provides replaces enhances
@@ -109,6 +113,7 @@ for my $control ($header, @binary_controls) {
 		next unless $control->{$field};
 		my $value = $control->{$field};
 		$value =~ s/\n(\s)/$1/g;
+		$value =~ s/\[[^\]]*\]//g;
 		if ($value =~ /(?:^|\s)
 			       (
 				(?:\w[^\s,|]+|\$\{\S+\})\s*
diff --git a/t/tests/control-file-general/debian/debian/control.in b/t/tests/control-file-general/debian/debian/control.in
index 7f2a587..50226c7 100644
--- a/t/tests/control-file-general/debian/debian/control.in
+++ b/t/tests/control-file-general/debian/debian/control.in
@@ -2,7 +2,16 @@ Source: {$srcpkg}
 Priority: extra
 Maintainer: {$author}
 Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7),
+ fiddle [amd64 powerpc
+ mips mipsel
+ hppa
+ s390],
+ faddle
+ (>>
+ 2) [
+ sparc i386 amd64
+ ]
 X-VCS-Svn: svn://svn.example.com/{$srcpkg}/trunk
 
 Package: {$srcpkg}

-- 
Debian package checker