The following commit has been merged in the master branch:
commit 396f3a31c506ae3332be2a9ebf09d9adfe614dd0
Author: Colin Watson <[EMAIL PROTECTED]>
Date: Fri Oct 31 14:54:17 2008 +0000
[CW] Add jaunty as an allowable distribution for Ubuntu, and remove the
EOLed edgy and feisty.
diff --git a/checks/lintian.desc b/checks/lintian.desc
index a27404f..ef8351a 100644
--- a/checks/lintian.desc
+++ b/checks/lintian.desc
@@ -28,7 +28,7 @@ Info: You've specified an unknown target distribution for
your upload in
the <tt>debian/changelog</tt> file.
.
Your version string suggests this package is for Ubuntu, so your
- distribution should be one of intrepid, hardy, gutsy, feisty, edgy or dapper.
+ distribution should be one of jaunty, intrepid, hardy, gutsy or dapper.
Tag: no-urgency-in-changes-file
Severity: normal
diff --git a/debian/changelog b/debian/changelog
index 6fdae0e..3e5bbf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ lintian (2.1.0) unstable; urgency=low
* frontend/lintian:
+ [FL] Convert to use Lintian::Output.
+ + [CW] Add jaunty as an allowable distribution for Ubuntu, and remove
+ the EOLed edgy and feisty.
* lib/Lintian/Output:
+ [FL] New module to bundle output methods.
diff --git a/frontend/lintian b/frontend/lintian
index 2e33ff0..cc65e35 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -822,8 +822,8 @@ while (my $arg = shift) {
if (defined $data->{distribution}) {
if ($data->{distribution} eq 'UNRELEASED') {
# ignore
- } elsif ($data->{'version'} =~
/ubuntu|intrepid|hardy|gutsy|feisty|edgy|dapper/) {
- my @ubuntu_dists = qw(intrepid hardy gutsy feisty edgy
dapper);
+ } elsif ($data->{'version'} =~
/ubuntu|jaunty|intrepid|hardy|gutsy|dapper/) {
+ my @ubuntu_dists = qw(jaunty intrepid hardy gutsy dapper);
my $regex = '^(' . join ('|', @ubuntu_dists) . ')';
if ($data->{distribution} !~
/^$regex(-(proposed|updates|backports|security))?$/ ) {
tag("bad-ubuntu-distribution-in-changes-file",
--
Debian package checker
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
