[SCM] Debian package checker branch, master, updated. 2.2.10-54-gdbee58d

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

The following commit has been merged in the master branch:
commit 55ef611680d274dab5e7d3be72d39ac2966df172
Author: Russ Allbery <rra@debian.org>
Date:   Fri May 22 10:37:03 2009 -0700

    Skip duplicate description checks for udeb packages
    
    * checks/control-file{,.desc}:
      + [RA] Skip duplicate description checks for udeb packages.  Thanks,
        Thijs Kinkhorst.  (Closes: #529924)

diff --git a/checks/control-file b/checks/control-file
index d0f9867..fb62cdd 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -144,7 +144,11 @@ for my $control (@binary_controls) {
 # caught by other checks.
 #
 # Also accumulate short and long descriptions for each package so that we can
-# check for duplication.
+# check for duplication, but skip udeb packages.  Ideally, we should check the
+# udeb package descriptions separately for duplication, but udeb packages
+# should be able to duplicate the descriptions of non-udeb packages and the
+# package description for udebs is much less important or significant to the
+# user.
 my $area;
 if ($header->{'section'}) {
 	if ($header->{'section'} =~ m%^([^/]+)/%) {
@@ -157,8 +161,13 @@ if ($header->{'section'}) {
 }
 my @descriptions;
 for my $binary_control (@binary_controls) {
-	push(@descriptions, [ $binary_control->{'package'}, split("\n", $binary_control->{'description'}, 2) ])
-	    if $binary_control->{'description'};
+	if ($binary_control->{'description'}
+	    and (not $binary_control->{'xc-package-type'}
+		 or $binary_control->{'xc-package-type'} ne 'udeb')) {
+		push(@descriptions,
+		     [ $binary_control->{'package'},
+		       split("\n", $binary_control->{'description'}, 2) ]);
+	}
 	next unless $binary_control->{'section'};
 	if (!defined ($area)) {
 		if ($binary_control->{'section'} =~ m%^([^/]+)/%) {
diff --git a/debian/changelog b/debian/changelog
index aa64a7c..f284f02 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ lintian (2.2.11) UNRELEASED; urgency=low
     + [ADB] Rename section-category-mismatch to section-area-mismatch.
     + [ADB] Update the description of section-area-mismatch to clarify
       that source packages in main may build binary packages in contrib.
+    + [RA] Skip duplicate description checks for udeb packages.  Thanks,
+      Thijs Kinkhorst.  (Closes: #529924)
   * checks/fields{,.desc}:
     + [RA] Allow python << dependencies without Python-Version if the
       package depends on python-support, which doesn't use the

-- 
Debian package checker