[SCM] Debian package checker branch, master, updated. 2.1.2-17-gb0dc93d

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

The following commit has been merged in the master branch:
commit b1b26eccd5e6d9aa48ac3479fa5e356446183985
Author: Russ Allbery <rra@debian.org>
Date:   Sat Dec 27 13:24:51 2008 -0800

    Parameterize the section of test suite packages and clean up changelogs
    
    Allow the section of a package generated by the test suite to be set in
    the *.desc file.  This makes it easier to write tests for checks on some
    packages without introducing spurious tags.
    
    Remove extra whitespace in debian/changelog to group by root directory.
    
    Collapse the changelog for the test suite skel package to only increment
    the version once since the previous Lintian release.

diff --git a/debian/changelog b/debian/changelog
index 5b34723..b738e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,10 +55,8 @@ lintian (2.1.3) UNRELEASED; urgency=low
     + [ADB] Ensure that the output of unpack/list-*pkg is correctly captured
       so that the reporting harness can use the information to decide which
       packages to process in an incremental run.
-
   * lib/Lintian/Data.pm:
     + [RA] New all() method that returns all valid keywords.
-
   * lib/Read_pkglists.pm:
     + [JP] Add a new "source version" field to binary and udeb info files.
       Bump binary and udeb format version to 3 and 2 respectively.
@@ -66,7 +64,6 @@ lintian (2.1.3) UNRELEASED; urgency=low
   * reporting/html_reports:
     + [JP] Group packages by source version instead of binary version.
       (Closes: #507849)
-
   * reporting/templates/maintainer.tmpl:
     + [ADB] Print tags affecting udeb packages under a heading for that
       package, rather than merging them in to whichever binary package
@@ -78,6 +75,9 @@ lintian (2.1.3) UNRELEASED; urgency=low
     + [JP] Include binary package version in subtitles when it isn't the same
       as the source version.
 
+  * t/runtests:
+    + [RA] Parameterize the package section in the skeleton.
+
   * unpack/list-{bin,udeb}pkg:
     + [JP] Extract source package version from source field.
 
diff --git a/t/runtests b/t/runtests
index 426558b..46f9bb9 100755
--- a/t/runtests
+++ b/t/runtests
@@ -283,6 +283,7 @@ sub check_test_is_sane {
     $data->{description} ||= 'No Description Available';
     $data->{author} ||= 'Debian Lintian Maintainers <lintian-maint@debian.org>';
     $data->{architecture} ||= 'all';
+    $data->{section} ||= 'devel';
 
     if ($debug) {
 	print "check_test_is_sane => ".Dumper($data);
diff --git a/t/templates/skel/debian/changelog b/t/templates/skel/debian/changelog
index fbc262a..583eae2 100644
--- a/t/templates/skel/debian/changelog
+++ b/t/templates/skel/debian/changelog
@@ -1,16 +1,13 @@
-skel (1.2) unstable; urgency=low
-
-  * ${shlibs:Depends}, not ${shlib:Depends}, in the control template.
-
- -- Russ Allbery <rra@debian.org>  Sat, 27 Dec 2008 11:19:20 -0800
-
 skel (1.1) unstable; urgency=low
 
+  * Parameterize the package section to make it easier to avoid spurious
+    tags for section mismatches when testing some types of packages.
+  * ${shlibs:Depends}, not ${shlib:Depends}, in the control template.
   * Expand the default long description to three lines to not trigger
     extended-description-is-probably-too-short.  Tell anyone looking at a
     test package that it shouldn't be installed like a normal package.
 
- -- Russ Allbery <rra@debian.org>  Fri, 26 Dec 2008 22:12:23 -0800
+ -- Russ Allbery <rra@debian.org>  Sat, 27 Dec 2008 13:16:40 -0800
 
 skel (1.0) unstable; urgency=low
 
diff --git a/t/templates/skel/debian/control.in b/t/templates/skel/debian/control.in
index 440343b..f8f5c04 100644
--- a/t/templates/skel/debian/control.in
+++ b/t/templates/skel/debian/control.in
@@ -1,6 +1,6 @@
 Source: {$srcpkg}
 Priority: extra
-Section: devel
+Section: {$section}
 Maintainer: {$author}
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 7)

-- 
Debian package checker