[SCM] Debian package checker branch, master, updated. 2.5.3-201-g9c1ccd0

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 9c1ccd0346698b8397ef94e43aa9b9f0ecd2234c
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Nov 5 09:09:34 2011 +0100

    Allow codenames as distribution in the changes-file
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/changes-file b/checks/changes-file
index f93108d..5192130 100644
--- a/checks/changes-file
+++ b/checks/changes-file
@@ -26,6 +26,7 @@ use Util;
 use Lintian::Tags qw(tag);
 use Lintian::Check qw(check_maintainer);
 
+my $DEBIAN_DISTS = Lintian::Data->new ('changelog-file/debian-dists');
 my $UBUNTU_REGEX;
 {
     my $ubuntu_dists = Lintian::Data->new ('changelog-file/ubuntu-dists');
@@ -64,11 +65,7 @@ if (defined $info->field('distribution')) {
                     tag 'bad-ubuntu-distribution-in-changes-file',
                         $distribution;
                 }
-        } elsif (! (($distribution eq 'oldstable')
-                     or ($distribution eq 'stable')
-                     or ($distribution eq 'testing')
-                     or ($distribution eq 'unstable')
-                     or ($distribution eq 'experimental')
+        } elsif (! ($DEBIAN_DISTS->known ($distribution)
                      or ($distribution =~ /^\w+-backports$/)
                      or ($distribution =~ /^\w+-proposed-updates$/)
                      or ($distribution =~ /^\w+-security$/)
diff --git a/data/changelog-file/debian-dists b/data/changelog-file/debian-dists
new file mode 100644
index 0000000..af8030c
--- /dev/null
+++ b/data/changelog-file/debian-dists
@@ -0,0 +1,15 @@
+# A list of Debian distributions, both code names and their
+# aliases
+
+# Codenames
+lenny
+wheezy
+sid
+
+# Aliases
+oldstable
+stable
+testing
+unstable
+experimental
+
diff --git a/debian/changelog b/debian/changelog
index 8f7bd76..1c51d30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,9 +15,11 @@ lintian (2.5.4) UNRELEASED; urgency=low
       (Closes: #642092)
     + [JW] Fixed a false-positive when using the multiarch dir in
       RPATH.  (Closes: #646817)
-  * checks/changes-file.desc:
+  * checks/changes-file{,.desc}:
     + [NT] Added the "precise" to the list of Ubuntu distributions.
       Thanks to Loïc Minier for the patch.
+    + [NT] Accept release codename in the changes file.  Thanks to
+      Julien Cristau for the report.  (Closes: #637540)
   * checks/common_data.pm:
     + [JW] Merged into Lintian::Check.
   * checks/cruft{,.desc}:
@@ -85,6 +87,8 @@ lintian (2.5.4) UNRELEASED; urgency=low
   * collcetion/debfiles:
     + [NT] Bail if the debian dir is a symlink.
 
+  * data/changelog-file/debian-dists:
+    + [NT] New file.
   * data/changelog-file/ubuntu-dists:
     + [NT] Added the "precise".  Thanks to Loïc Minier for the
       patch.  (Closes: #644488)

-- 
Debian package checker