[lintian] 01/04: c/debhelper: Remove logic for CDBS creating compat file
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 5246b1f3d5de82cf109933a4936d2ceaa322c051
Author: Niels Thykier <niels@thykier.net>
Date: Sun Sep 11 09:47:35 2016 +0000
c/debhelper: Remove logic for CDBS creating compat file
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/debhelper.pm | 8 +-------
debian/changelog | 3 +++
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index 3883033..6e4bc26 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -58,7 +58,6 @@ sub run {
my $needtomodifyscripts = '';
my $level;
my $compat = 0;
- my $usescdbs = '';
my $seendhcleank = '';
my %missingbdeps;
my %missingbdeps_addons;
@@ -166,10 +165,8 @@ sub run {
$needtomodifyscripts = 1;
$inclcdbs = 1;
- # CDBS sets DH_COMPAT but doesn't export it. It does, however, create
- # a debian/compat file if none was found; that logic is handled later.
+ # CDBS sets DH_COMPAT but doesn't export it.
$dhcompatvalue = $cdbscompat;
- $usescdbs = 1;
} elsif (/^\s*export\s+DH_COMPAT\s*:?=\s*([^\s]+)/) {
$level = $1;
} elsif (/^\s*export\s+DH_COMPAT/) {
@@ -290,9 +287,6 @@ sub run {
$compatnan = 1;
}
- if ($usescdbs and not defined($level)) {
- $level = $cdbscompat;
- }
$level ||= 1;
if ($level < $compat_level->value('deprecated')) {
tag 'package-uses-deprecated-debhelper-compat-version', $level;
diff --git a/debian/changelog b/debian/changelog
index 6bda652..4d085a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ lintian (2.5.47) UNRELEASED; urgency=medium
(Closes: #834797)
* checks/cruft.desc:
+ [JW] Fix typo.
+ * checks/debhelper.pm:
+ + [NT] Remove logic for CDBS creating a compat file when it is absent
+ as debhelper now requires a compat file unconditionally.
* checks/duplicate-files.desc:
+ [JW] Fix typo.
* checks/fields.{desc,pm}:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: