[lintian] 01/01: c/debhelper: Remove named compat level code
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 77ff1ed26d7799a451f312c68d64e570b33e8ea5
Author: Niels Thykier <niels@thykier.net>
Date: Sat Oct 28 10:13:21 2017 +0000
c/debhelper: Remove named compat level code
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/debhelper.pm | 25 ++--------------------
data/debhelper/named-compat-levels | 5 -----
debian/changelog | 5 +++++
.../debhelper-compat-named/debian/debian/compat | 1 -
.../debian/debian/control.in | 16 --------------
t/tests/debhelper-compat-named/desc | 8 -------
t/tests/debhelper-compat-named/tags | 1 -
7 files changed, 7 insertions(+), 54 deletions(-)
diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index da15d1a..ade91a1 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -47,13 +47,11 @@ my $dh_addons_manual
my $compat_level = Lintian::Data->new('debhelper/compat-level',qr/=/);
my $MISC_DEPENDS = Lintian::Relation->new('${misc:Depends}');
-my $NAMED_COMPAT_LEVELS = Lintian::Data->new('debhelper/named-compat-levels',
- qr/\s*=>\s*/, \&_named_compat_levels);
sub run {
my (undef, undef, $info) = @_;
my $droot = $info->index_resolved_path('debian/');
- my ($drules, $dh_bd_version, $level, $using_named_compat);
+ my ($drules, $dh_bd_version, $level);
my $seencommand = '';
my $needbuilddepends = '';
@@ -279,12 +277,7 @@ sub run {
strip($compat);
if ($compat ne '') {
my $compat_value = $compat;
- my $named_compat = $NAMED_COMPAT_LEVELS->value($compat);
- if (defined($named_compat)) {
- $dh_bd_version = $named_compat->{'introduced-in'};
- $compat_value = $named_compat->{'compat-level'};
- $using_named_compat = 1;
- } elsif ($compat !~ m/^\d+$/) {
+ if ($compat !~ m/^\d+$/) {
tag 'debhelper-compat-not-a-number', $compat;
$compat =~ s/[^\d]//g;
$compat_value = $compat;
@@ -292,7 +285,6 @@ sub run {
}
if ($level) {
my $c = $compat;
- $c .= " ($compat_value)" if $using_named_compat;
tag 'declares-possibly-conflicting-debhelper-compat-versions',
"rules=$level compat=${c}";
} else {
@@ -460,9 +452,6 @@ sub run {
my @extra = ($level);
$tagname = 'package-lacks-versioned-build-depends-on-debhelper'
if ($dh_bd_version <= $compat_level->value('pedantic'));
- if ($using_named_compat) {
- push(@extra, '(for the named compat level)');
- }
tag $tagname, @extra;
}
@@ -619,16 +608,6 @@ sub _shebang_cmd {
return $cmd;
}
-sub _named_compat_levels {
- my ($key, $raw_val, undef) = @_;
- my $result = {};
- for my $opt (split(m/\s*,\s*/, $raw_val)) {
- my ($key, $val) = split(m/\s*=\s*/, $opt, 2);
- $result->{$key} = $val;
- }
- return $result;
-}
-
1;
# Local Variables:
diff --git a/data/debhelper/named-compat-levels b/data/debhelper/named-compat-levels
deleted file mode 100644
index 47c221d..0000000
--- a/data/debhelper/named-compat-levels
+++ /dev/null
@@ -1,5 +0,0 @@
-# List of all "named" compat levels and when they were introduced
-#
-
-beta-tester => introduced-in=10,compat-level=10
-bleeding-edge-tester => introduced-in=10,compat-level=10
diff --git a/debian/changelog b/debian/changelog
index e3a22f9..ab677a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ lintian (2.5.57) UNRELEASED; urgency=medium
+ [CL] Drop README.source from files to check against the
file-contains-trailing-whitespace tag as it can include quotes
from upstream that would be ideally left intact.
+ * checks/debhelper.pm:
+ + [NT] Remove code handling named compat levels.
* commands/lintian.pm:
+ [NT] Have lintian resignal between various stages of the
@@ -18,6 +20,9 @@ lintian (2.5.57) UNRELEASED; urgency=medium
"semi-ignored" with lintian happily continuing to process the
next package. (Closes: #878575)
+ * data/debhelper/named-compat-levels:
+ + [NT] Removed; no longer used.
+
-- Chris Lamb <lamby@debian.org> Fri, 27 Oct 2017 20:00:29 +0100
lintian (2.5.56) unstable; urgency=medium
diff --git a/t/tests/debhelper-compat-named/debian/debian/compat b/t/tests/debhelper-compat-named/debian/debian/compat
deleted file mode 100644
index 400f85f..0000000
--- a/t/tests/debhelper-compat-named/debian/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-beta-tester
diff --git a/t/tests/debhelper-compat-named/debian/debian/control.in b/t/tests/debhelper-compat-named/debian/debian/control.in
deleted file mode 100644
index c40b951..0000000
--- a/t/tests/debhelper-compat-named/debian/debian/control.in
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: {$source}
-Priority: optional
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper
-Rules-Requires-Root: no
-
-Package: {$source}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/debhelper-compat-named/desc b/t/tests/debhelper-compat-named/desc
deleted file mode 100644
index 5c2ede7..0000000
--- a/t/tests/debhelper-compat-named/desc
+++ /dev/null
@@ -1,8 +0,0 @@
-Testname: debhelper-compat-named
-Version: 1.0
-Description: Test support for named compat levels
-Test-Depends: debhelper (>= 10),
-Test-For:
- package-needs-versioned-debhelper-build-depends
-Test-Against:
- debhelper-compat-not-a-number
diff --git a/t/tests/debhelper-compat-named/tags b/t/tests/debhelper-compat-named/tags
deleted file mode 100644
index c96c9ee..0000000
--- a/t/tests/debhelper-compat-named/tags
+++ /dev/null
@@ -1 +0,0 @@
-W: debhelper-compat-named source: package-needs-versioned-debhelper-build-depends 10 (for the named compat level)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: