lintian: r1060 - in trunk: checks debian frontend
Author: rra
Date: 2007-12-07 06:01:58 +0100 (Fri, 07 Dec 2007)
New Revision: 1060
Modified:
trunk/checks/common_data.pm
trunk/checks/fields
trunk/checks/lintian.desc
trunk/checks/nmu
trunk/debian/changelog
trunk/frontend/lintian
Log:
+ [RA] Ignore Original-Maintainer if the version contains ubuntu.
* checks/lintian.desc:
+ [RA] Add bad-ubuntu-distribution-in-changes-file, merged from the
Ubuntu patch.
* checks/nmu:
+ [RA] No packages with ubuntu in the version number are NMUs. Merged
from the Ubuntu patch.
* frontend/lintian:
+ [RA] If the version number indicates an Ubuntu package, check
against a different list of allowable distributions. Merged from
the Ubuntu patch.
Modified: trunk/checks/common_data.pm
===================================================================
--- trunk/checks/common_data.pm 2007-12-07 04:46:03 UTC (rev 1059)
+++ trunk/checks/common_data.pm 2007-12-07 05:01:58 UTC (rev 1060)
@@ -80,6 +80,7 @@
%known_prios = map { $_ => 1 }
('required', 'important', 'standard', 'optional', 'extra');
+# The Ubuntu original-maintainer field is handled separately.
%known_source_fields = map { $_ => 1 }
('source', 'version', 'maintainer', 'binary', 'architecture',
'standards-version', 'files', 'build-depends', 'build-depends-indep',
@@ -88,12 +89,14 @@
'vcs-bzr', 'vcs-cvs', 'vcs-darcs', 'vcs-git', 'vcs-hg', 'vcs-mtn',
'vcs-svn', 'vcs-browser', 'dm-upload-allowed');
+# The Ubuntu original-maintainer field is handled separately.
%known_binary_fields = map { $_ => 1 }
('package', 'version', 'architecture', 'depends', 'pre-depends',
'recommends', 'suggests', 'enhances', 'conflicts', 'provides',
'replaces', 'essential', 'maintainer', 'section', 'priority',
'source', 'description', 'installed-size', 'python-version', 'homepage');
+# The Ubuntu original-maintainer field is handled separately.
%known_udeb_fields = map { $_ => 1 }
('package', 'version', 'architecture', 'subarchitecture', 'depends',
'recommends', 'enhances', 'provides', 'installer-menu-item',
Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields 2007-12-07 04:46:03 UTC (rev 1059)
+++ trunk/checks/fields 2007-12-07 05:01:58 UTC (rev 1060)
@@ -818,6 +818,8 @@
for my $field (glob("fields/*")) {
$field =~ s!^fields/!!;
+ next if ($field eq 'original-maintainer') and $version =~ /ubuntu/;
+
tag "obsolete-field", "$field"
if $known_obsolete_fields{$field};
Modified: trunk/checks/lintian.desc
===================================================================
--- trunk/checks/lintian.desc 2007-12-07 04:46:03 UTC (rev 1059)
+++ trunk/checks/lintian.desc 2007-12-07 05:01:58 UTC (rev 1060)
@@ -11,14 +11,21 @@
Tag: bad-distribution-in-changes-file
Type: error
-Info: You've specified an unknown `target distribution' for your upload in
+Info: You've specified an unknown target distribution for your upload in
the <tt>debian/changelog</tt> file.
.
- Note, that the distributions <tt>non-free</tt> and <tt>contrib</tt>
- are no longer valid. You'll have to use distribution
- `<tt>unstable</tt>' and `<tt>Section: non-free/xxx</tt>' or
- `<tt>Section: contrib/xxx</tt>' instead.
+ Note that the distributions <tt>non-free</tt> and <tt>contrib</tt> are no
+ longer valid. You'll have to use distribution <tt>unstable</tt> and
+ <tt>Section: non-free/xxx</tt> or <tt>Section: contrib/xxx</tt> instead.
+Tag: bad-ubuntu-distribution-in-changes-file
+Type: error
+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 hardy, gutsy, feisty, edgy or dapper.
+
Tag: no-urgency-in-changes-file
Type: warning
Info: There is no "Urgency" field in the .changes file. This field is
Modified: trunk/checks/nmu
===================================================================
--- trunk/checks/nmu 2007-12-07 04:46:03 UTC (rev 1059)
+++ trunk/checks/nmu 2007-12-07 05:01:58 UTC (rev 1060)
@@ -77,6 +77,12 @@
$upload_is_nmu = 0 if grep /^\s*\Q$uploader\E\s*$/, @uploaders;
}
+# No such thing as NMUs in Ubuntu-land.
+if ($version =~ /ubuntu/) {
+ $upload_is_nmu = 0;
+ $version_nmuness = 0;
+}
+
if ($maintainer =~ /packages\@qa.debian.org/) {
tag "orphaned-package-should-not-have-uploaders", ""
if defined $uploaders;
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-12-07 04:46:03 UTC (rev 1059)
+++ trunk/debian/changelog 2007-12-07 05:01:58 UTC (rev 1060)
@@ -8,12 +8,24 @@
+ [RA] Warn about lib.*-dev packages not in section libdevel.
+ [RA] Warn about debug packages that aren't priority: extra. Thanks,
Joerg Jaspert. (Closes: #454358)
+ + [RA] Ignore Original-Maintainer if the version contains ubuntu.
* checks/files:
+ [RA] Warn about packages providing files in /usr/lib/debug that
aren't named -dbg. Thanks, Joerg Jaspert.
+ * checks/lintian.desc:
+ + [RA] Add bad-ubuntu-distribution-in-changes-file, merged from the
+ Ubuntu patch.
+ * checks/nmu:
+ + [RA] No packages with ubuntu in the version number are NMUs. Merged
+ from the Ubuntu patch.
- -- Russ Allbery <rra@debian.org> Thu, 06 Dec 2007 20:43:36 -0800
+ * frontend/lintian:
+ + [RA] If the version number indicates an Ubuntu package, check
+ against a different list of allowable distributions. Merged from
+ the Ubuntu patch.
+ -- Russ Allbery <rra@debian.org> Thu, 06 Dec 2007 21:01:51 -0800
+
lintian (1.23.38) unstable; urgency=low
* The "HE's brown paper bag bug" release
Modified: trunk/frontend/lintian
===================================================================
--- trunk/frontend/lintian 2007-12-07 04:46:03 UTC (rev 1059)
+++ trunk/frontend/lintian 2007-12-07 05:01:58 UTC (rev 1060)
@@ -636,18 +636,26 @@
}
# check distribution field
- if (defined $data->{distribution}
- and ! (($data->{distribution} eq 'stable')
- or ($data->{distribution} eq 'testing')
- or ($data->{distribution} eq 'unstable')
- or ($data->{distribution} eq 'experimental')
- or ($data->{distribution} =~ /\w+-backports/)
- or ($data->{distribution} =~ /\w+-proposed-updates/)
- or ($data->{distribution} =~ /\w+-security/))
- ) {
- # bad distribution entry
- tag("bad-distribution-in-changes-file",
- $data->{distribution});
+ if (defined $data->{distribution}) {
+ if ($data->{'version'} =~ /ubuntu/) {
+ my @ubuntu_dists = qw(hardy gutsy feisty edgy dapper);
+ my $regex = '^(' . join ('|', @ubuntu_dists) . ')';
+ if ($data->{distribution} !~ /^$regex(-(proposed|updates|backports|security))?$/ ) {
+ tag("bad-ubuntu-distribution-in-changes-file",
+ $data->{distribution});
+ }
+ } elsif (! (($data->{distribution} eq 'stable')
+ or ($data->{distribution} eq 'testing')
+ or ($data->{distribution} eq 'unstable')
+ or ($data->{distribution} eq 'experimental')
+ or ($data->{distribution} =~ /\w+-backports/)
+ or ($data->{distribution} =~ /\w+-proposed-updates/)
+ or ($data->{distribution} =~ /\w+-security/))
+ ) {
+ # bad distribution entry
+ tag("bad-distribution-in-changes-file",
+ $data->{distribution});
+ }
}
# Urgency is only recommended by Policy.
Reply to: