[SCM] Debian package checker branch, master, updated. 2.1.4-10-g8f0ad40

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

The following commit has been merged in the master branch:
commit 8f0ad408635d9e0bd20354ca26d61f089ea56254
Author: Russ Allbery <rra@debian.org>
Date:   Sat Jan 10 20:59:06 2009 -0800

    Clarify the binary-control-field-duplicates-source tag
    
    * checks/control-file{,.desc}:
      + [RA] Clarify the binary-control-field-duplicates-source tag.
        (Closes: #511213)

diff --git a/checks/control-file b/checks/control-file
index 1a8e8d1..0709eab 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -76,7 +76,7 @@ for my $binary_control (@binary_controls) {
 	    if ($binary_control->{"build-depends"} || $binary_control->{"build-depends-indep"} ||
 	        $binary_control->{"build-conflicts"} || $binary_control->{"build-conflicts-indep"});
 	for my $field (keys %$binary_control) {
-		tag 'binary-control-field-duplicates-source', $field, "in package ".$binary_control->{'package'},
+		tag 'binary-control-field-duplicates-source', "field \"$field\" in package ".$binary_control->{'package'},
 		    if ($header->{$field} && $binary_control->{$field} eq $header->{$field});
 	}
 }
diff --git a/debian/changelog b/debian/changelog
index 71fe543..71f14ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ lintian (2.1.5) UNRELEASED; urgency=low
   * checks/control-file{,.desc}:
     + [RA] Tag (severity: wishlist) duplicate short or long descriptions
       in packages built from the same source.  (Closes: #30020)
+    + [RA] Clarify the binary-control-field-duplicates-source tag.
+      (Closes: #511213)
   * checks/deb-format{,.desc}:
     + [RA] New check for the format of *.deb ar archives.  Most cases will
       fail during unpack, but dpkg-deb is more forgiving than dak and
diff --git a/t/tests/control-file-general/tags b/t/tests/control-file-general/tags
index fc2c4e0..56b5297 100644
--- a/t/tests/control-file-general/tags
+++ b/t/tests/control-file-general/tags
@@ -1,5 +1,5 @@
 E: control-file-general source: build-info-in-binary-control-file-section Package control-file-general
-I: control-file-general source: binary-control-field-duplicates-source maintainer in package control-file-general
+I: control-file-general source: binary-control-field-duplicates-source field "maintainer" in package control-file-general
 I: control-file-general source: duplicate-long-description control-file-general control-file-general-1 control-file-general-2
 I: control-file-general source: duplicate-short-description control-file-general control-file-general-1
 W: control-file-general source: no-section-field-for-source
diff --git a/testset/tags.binary b/testset/tags.binary
index 83d7a58..6f4b30b 100644
--- a/testset/tags.binary
+++ b/testset/tags.binary
@@ -50,7 +50,7 @@ E: binary: su-wrapper-without--c /usr/share/menu/binary:3 sux
 E: binary: suidregister-used-in-maintainer-script postinst
 E: binary: symlink-contains-spurious-segments usr/share/doc/binary/html/ch2.html ../html/./ch1.html
 E: binary: unstripped-binary-or-object ./usr/bin/hello
-I: binary source: binary-control-field-duplicates-source vcs-svn in package binary
+I: binary source: binary-control-field-duplicates-source field "vcs-svn" in package binary
 I: binary source: xs-vcs-header-in-debian-control xs-vcs-browser
 I: binary: arch-dep-package-has-big-usr-share
 I: binary: binary-has-unneeded-section ./usr/bin/hello-static .comment

-- 
Debian package checker