[SCM] Debian package checker branch, master, updated. 2.5.6-47-g4d03dca
The following commit has been merged in the master branch:
commit 4d03dca33baa937b631608e87f992df696163385
Author: Niels Thykier <niels@thykier.net>
Date: Mon Apr 2 23:21:15 2012 +0200
c/nmu: Remove Ubuntu specific code
Instead disable the affected tags via the ubuntu/main profile. Also
remove some empty second arguments to "tag" in checks/nmu.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/nmu b/checks/nmu
index 47abcb4..4981b35 100644
--- a/checks/nmu
+++ b/checks/nmu
@@ -26,14 +26,6 @@ use Lintian::Data;
use Lintian::Tags qw(tag);
use Util;
-# Used to match Ubuntu distribution names in target distributions.
-our $UBUNTU_REGEX;
-{
- my $dists = Lintian::Data->new('changelog-file/ubuntu-dists');
- my $string = join ('|', 'ubuntu', $dists->all);
- $UBUNTU_REGEX = qr/$string/o;
-}
-
sub run {
my $pkg = shift;
@@ -55,7 +47,6 @@ if (-l $info->debfiles('changelog')) {
# Get some data from the changelog file.
my ($entry) = $info->changelog->data;
-my $distribution = $entry->Distribution;
my $uploader = canonicalize($entry->Maintainer);
my $changes = $entry->Changes;
$changes =~ s/^(\s*\n)+//;
@@ -105,18 +96,12 @@ if (defined $uploaders) {
$upload_is_nmu = 0 if grep /^\s*\Q$uploader\E\s*$/, @uploaders;
}
-# No such thing as NMUs in Ubuntu-land.
-if ($version =~ /$UBUNTU_REGEX/ or $distribution =~ /$UBUNTU_REGEX/) {
- $upload_is_nmu = 0;
- $version_nmuness = 0;
-}
-
if ($maintainer =~ /packages\@qa.debian.org/) {
- tag 'orphaned-package-should-not-have-uploaders', ''
+ tag 'orphaned-package-should-not-have-uploaders'
if defined $uploaders;
tag 'qa-upload-has-incorrect-version-number', $version
if $version_nmuness == 1;
- tag 'changelog-should-mention-qa', ''
+ tag 'changelog-should-mention-qa'
if !$changelog_mentions_qa;
} elsif ($changelog_mentions_team_upload) {
tag 'team-upload-has-incorrect-version-number', $version
@@ -124,12 +109,12 @@ if ($maintainer =~ /packages\@qa.debian.org/) {
} else {
# Local packages may be either NMUs or not.
unless ($changelog_mentions_local || $version_local) {
- tag 'changelog-should-mention-nmu', ''
+ tag 'changelog-should-mention-nmu'
if !$changelog_mentions_nmu && $upload_is_nmu;
tag 'source-nmu-has-incorrect-version-number', $version
if $upload_is_nmu && $version_nmuness != 1;
}
- tag 'changelog-should-not-mention-nmu', ''
+ tag 'changelog-should-not-mention-nmu'
if $changelog_mentions_nmu && !$upload_is_nmu;
tag 'maintainer-upload-has-incorrect-version-number', $version
if !$upload_is_nmu && $version_nmuness;
diff --git a/debian/changelog b/debian/changelog
index c634689..1e17e9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,9 @@ lintian (2.5.7) UNRELEASED; urgency=low
change. Thanks, Iustin Pop. (Closes: #664471)
* checks/menus{,.desc}:
+ [NT] Remove "manual" lazy load of data file.
+ * checks/nmu:
+ + [NT] Remove Ubuntu specific code to handle their (lack of) NMUs.
+ These tags are instead suppressed by the Ubuntu profile.
* checks/scripts{,.desc}:
+ [NT] Mention devref 6.4 in command-with-path-in-maintainer-script.
Thanks to Arno Töll for the patch.
@@ -114,6 +117,10 @@ lintian (2.5.7) UNRELEASED; urgency=low
Previously, duplicate fields were silently ignored (except
when a separate tag would check for it). (Closes: #664061)
+ * profiles/ubuntu/main.profile:
+ + [NT] Add a number of NMU related tags to the list of disabled
+ tags.
+
* vendors/ubuntu/main/data/common/source-fields:
+ [NT] New file.
* vendors/ubuntu/main/data/fields/{binary,udeb}-fields:
diff --git a/profiles/ubuntu/main.profile b/profiles/ubuntu/main.profile
index fd84533..25c35a4 100644
--- a/profiles/ubuntu/main.profile
+++ b/profiles/ubuntu/main.profile
@@ -1,9 +1,14 @@
# The default profile for Ubuntu and derivatives thereof.
Profile: ubuntu/main
Extends: debian/main
-Disable-Tags: debian-changelog-file-is-a-symlink,
- lzma-deb-archive, maintainer-address-causes-mail-loops-or-bounces,
- no-upstream-changelog, uploader-address-causes-mail-loops-or-bounces,
+Disable-Tags: changelog-should-mention-nmu,
+ debian-changelog-file-is-a-symlink, lzma-deb-archive,
+ maintainer-address-causes-mail-loops-or-bounces,
+ maintainer-upload-has-incorrect-version-number,
+ no-upstream-changelog, qa-upload-has-incorrect-version-number,
+ source-nmu-has-incorrect-version-number,
+ team-upload-has-incorrect-version-number,
+ uploader-address-causes-mail-loops-or-bounces,
upstart-job-in-etc-init.d-not-registered-via-update-rc.d
# Serious as it may break Lucid upgrade path
--
Debian package checker
Reply to: