[lintian] 01/01: c/debhelper: Unconditionally tag dh_clean -k usage
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 8f8c04a054b75656ab678ba12a6ef30f403ce5d7
Author: Niels Thykier <niels@thykier.net>
Date: Sat Sep 5 08:18:24 2015 +0200
c/debhelper: Unconditionally tag dh_clean -k usage
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/debhelper.desc | 4 +--
checks/debhelper.pm | 2 +-
debian/changelog | 3 ++
.../debhelper-dh-clean-k-ok/debian/debian/compat | 1 -
.../debian/debian/control.in | 15 ---------
.../debhelper-dh-clean-k-ok/debian/debian/rules | 37 ----------------------
t/tests/debhelper-dh-clean-k-ok/desc | 6 ----
t/tests/debhelper-dh-clean-k-ok/tags | 0
t/tests/generic-dh-make-2005/tags | 1 +
t/tests/legacy-debconf/tags | 1 +
t/tests/legacy-debug/tags | 1 +
11 files changed, 8 insertions(+), 63 deletions(-)
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index a2614e9..07f5efd 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -118,9 +118,7 @@ Severity: normal
Certainty: certain
Ref: dh_clean(1)
Info: This package calls dh_clean -k in its <tt>debian/rules</tt> file
- and declares a debhelper compatibility version of at least 7.
- .
- debhelper 7 deprecated dh_clean -k in favour of dh_prep.
+ instread of dh_prep.
Tag: debhelper-compat-file-is-empty
Severity: important
diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index 7949c4b..f40f8ab 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -278,7 +278,7 @@ sub run {
tag 'package-uses-experimental-debhelper-compat-version', $level;
}
- if ($seendhcleank and $level >= 7) {
+ if ($seendhcleank) {
tag 'dh-clean-k-is-deprecated';
}
diff --git a/debian/changelog b/debian/changelog
index 1eed4a0..f534e02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ lintian (2.5.37) UNRELEASED; urgency=medium
stripping comment. Classify to minified if line > 1024.
+ [BR] Fix false positive in missing-sources directory
search path.
+ * checks/debhelper.pm:
+ + [NT] Unconditionally warn about dh_clean -k usage even when the
+ debhelper compat is less than 7.
* checks/description.pm:
+ [AB] Fix false positives in
perl-module-name-not-mentioned-in-description. (Closes: #795779)
diff --git a/t/tests/debhelper-dh-clean-k-ok/debian/debian/compat b/t/tests/debhelper-dh-clean-k-ok/debian/debian/compat
deleted file mode 100644
index 1e8b314..0000000
--- a/t/tests/debhelper-dh-clean-k-ok/debian/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in b/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
deleted file mode 100644
index 6a25cdc..0000000
--- a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 6)
-
-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-dh-clean-k-ok/debian/debian/rules b/t/tests/debhelper-dh-clean-k-ok/debian/debian/rules
deleted file mode 100755
index 243e5c2..0000000
--- a/t/tests/debhelper-dh-clean-k-ok/debian/debian/rules
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/make -f
-#
-# Use an alternate rules file that doesn't call dh to test not warning
-# about debhelper script tokens if we call no programs that care about
-# them.
-
-pkg = $(shell dh_listpackages)
-
-build: build-indep build-arch
-build-arch:
-build-indep:
-
-clean:
- dh_testdir
- dh_testroot
- dh_clean
-
-binary: binary-indep binary-arch
-binary-arch:
-binary-indep:
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_install
- dh_installchangelogs
- dh_installdebconf
- # dh_installdocs may modify maintainer scripts
- install -m 644 debian/copyright debian/$(pkg)/usr/share/doc/$(pkg)
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-.PHONY: build-arch build-indep build binary binary-arch binary-indep clean
diff --git a/t/tests/debhelper-dh-clean-k-ok/desc b/t/tests/debhelper-dh-clean-k-ok/desc
deleted file mode 100644
index 6497cc6..0000000
--- a/t/tests/debhelper-dh-clean-k-ok/desc
+++ /dev/null
@@ -1,6 +0,0 @@
-Testname: debhelper-dh-clean-k-ok
-Sequence: 6000
-Version: 1.0
-Description: Test that debhelper < 7 packages can use dh_clean -k
-Test-Against:
- dh-clean-k-is-deprecated
diff --git a/t/tests/debhelper-dh-clean-k-ok/tags b/t/tests/debhelper-dh-clean-k-ok/tags
deleted file mode 100644
index e69de29..0000000
diff --git a/t/tests/generic-dh-make-2005/tags b/t/tests/generic-dh-make-2005/tags
index 392b7ff..abf85a6 100644
--- a/t/tests/generic-dh-make-2005/tags
+++ b/t/tests/generic-dh-make-2005/tags
@@ -10,6 +10,7 @@ W: generic-dh-make-2005 source: debian-rules-ignores-make-clean-error line 47
W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-arch
W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-indep
W: generic-dh-make-2005 source: debian-rules-sets-DH_COMPAT line 12
+W: generic-dh-make-2005 source: dh-clean-k-is-deprecated
W: generic-dh-make-2005 source: dh_suidregister-is-obsolete line 85
W: generic-dh-make-2005 source: package-uses-deprecated-debhelper-compat-version 2
W: generic-dh-make-2005: copyright-without-copyright-notice
diff --git a/t/tests/legacy-debconf/tags b/t/tests/legacy-debconf/tags
index f1bd942..b346604 100644
--- a/t/tests/legacy-debconf/tags
+++ b/t/tests/legacy-debconf/tags
@@ -35,6 +35,7 @@ W: debconf source: ancient-standards-version 3.7.2 (current is CURRENT)
W: debconf source: debian-rules-calls-debhelper-in-odd-order dh_makeshlibs (line 56)
W: debconf source: debian-rules-calls-debhelper-in-odd-order dh_makeshlibs (line 60)
W: debconf source: debian-rules-sets-DH_COMPAT line 3
+W: debconf source: dh-clean-k-is-deprecated
W: debconf source: dpatch-build-dep-but-no-patch-list
W: debconf source: invalid-po-file debian/po/fr.po
W: debconf source: invalid-po-file debian/po/sample-file.po
diff --git a/t/tests/legacy-debug/tags b/t/tests/legacy-debug/tags
index 2855522..0cee9b9 100644
--- a/t/tests/legacy-debug/tags
+++ b/t/tests/legacy-debug/tags
@@ -28,6 +28,7 @@ W: debug source: debhelper-but-no-misc-depends hello-hello-dbg
W: debug source: debhelper-but-no-misc-depends hi-dbg
W: debug source: debhelper-compat-file-is-missing
W: debug source: debian-rules-sets-DH_COMPAT line 5
+W: debug source: dh-clean-k-is-deprecated
W: debug source: timewarp-standards-version (2006-04-04 < 2006-04-26)
W: hello-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/bin/hello
W: hello-hello-dbg: latest-debian-changelog-entry-without-new-version
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: