[lintian] 01/01: dh-exec-useless-usage applies to install/manpages only
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 7ed7a25acf523d2a820785841be96a01814c5f2f
Author: Gergely Nagy <algernon@madhouse-project.org>
Date: Tue Mar 1 08:58:17 2016 +0100
dh-exec-useless-usage applies to install/manpages only
Using ${DEB_HOST_MULTIARCH} in, say, dirs is perfectly legitimate. Do
the test for install/manpages files only. Fixes #816341.
[nthykier: Update test to work without dh-exec being installed]
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/debhelper.pm | 2 +-
debian/changelog | 6 +++++-
t/tests/debhelper-dh-exec/debian/debian/dirs | 1 +
t/tests/debhelper-dh-exec/debian/debian/{dirs => docs} | 2 +-
t/tests/debhelper-dh-exec/debian/debian/rules | 5 +++++
t/tests/debhelper-dh-exec/tags | 2 +-
6 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index b4c25f1..1c0c589 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -486,7 +486,7 @@ sub _check_dh_exec {
$dhe_useless = 1;
}
}
- if ($dhe_useless) {
+ if ($dhe_useless && $path =~ /debian\/.*(install|manpages)/ ) {
my $form = $_;
chomp($form);
$form = "\"$form\"";
diff --git a/debian/changelog b/debian/changelog
index 51936c9..a26465b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ lintian (2.5.44) UNRELEASED; urgency=medium
+ [NT] Avoid advertising python-support as possible solution for
python-depends-but-no-python-helper. Thanks to Gunnar Wolf for
the bug report. (Closes: #754315)
+ + [NT] Apply patch from Gergely Nagy to only emit the
+ dh-exec-useless-usage check for install and manpages files.
+ Thanks to Rafael Laboissière for the report.
+ (Closes: #816341)
* checks/debian-source-dir.{desc,pm}:
+ [NT] Add tag for classifying the source format.
(Closes: #612610)
@@ -62,7 +66,7 @@ lintian (2.5.44) UNRELEASED; urgency=medium
(Closes: #818607)
* checks/shared-libs.{desc,pm}:
+ [NT] Rename and clarify some ldconfig related tags to better reflect
- the use of the ldconfig trigger. Thanks to Rafael Laboissiere for
+ the use of the ldconfig trigger. Thanks to Rafael Laboissière for
reporting this. (Closes: #809577)
+ [NT] Merge and remove some ldconfig related tags. Notably
unconditionally flag all uses of ldconfig in maintainer scripts
diff --git a/t/tests/debhelper-dh-exec/debian/debian/dirs b/t/tests/debhelper-dh-exec/debian/debian/dirs
index bc147d0..aaac17a 100755
--- a/t/tests/debhelper-dh-exec/debian/debian/dirs
+++ b/t/tests/debhelper-dh-exec/debian/debian/dirs
@@ -1,2 +1,3 @@
#! /usr/bin/dh-exec
usr/lib
+usr/lib/${DEB_HOST_MULTIARCH}/octave/packages
diff --git a/t/tests/debhelper-dh-exec/debian/debian/dirs b/t/tests/debhelper-dh-exec/debian/debian/docs
similarity index 60%
copy from t/tests/debhelper-dh-exec/debian/debian/dirs
copy to t/tests/debhelper-dh-exec/debian/debian/docs
index bc147d0..ce8e762 100755
--- a/t/tests/debhelper-dh-exec/debian/debian/dirs
+++ b/t/tests/debhelper-dh-exec/debian/debian/docs
@@ -1,2 +1,2 @@
#! /usr/bin/dh-exec
-usr/lib
+debian/rules
diff --git a/t/tests/debhelper-dh-exec/debian/debian/rules b/t/tests/debhelper-dh-exec/debian/debian/rules
index 2c54696..62ed211 100755
--- a/t/tests/debhelper-dh-exec/debian/debian/rules
+++ b/t/tests/debhelper-dh-exec/debian/debian/rules
@@ -3,6 +3,11 @@
%:
dh $@
+# Ignore the "docs" file as we do not really depend on dh-exec and we
+# do not really need the files listed there for the test.
+override_dh_installdocs:
+ dh_installdocs --ignore debian/docs
+
override_dh_installman:
override_dh_install:
diff --git a/t/tests/debhelper-dh-exec/tags b/t/tests/debhelper-dh-exec/tags
index 6d45ebe..d5030b2 100644
--- a/t/tests/debhelper-dh-exec/tags
+++ b/t/tests/debhelper-dh-exec/tags
@@ -5,4 +5,4 @@ I: debhelper-dh-exec source: dh-exec-subst-unknown-variable debian/manpages DEB_
I: debhelper-dh-exec source: dh-exec-useless-usage debian/install "usr/lib/${DEB_HOST_MULTIARCH} /usr/lib/${DEB_HOST_MULTIARCH}/"
I: debhelper-dh-exec source: dh-exec-useless-usage debian/install "usr/lib/${DEB_HOST_MULTIARCH}"
I: debhelper-dh-exec source: dh-exec-useless-usage debian/install "usr/lib/${DEB_HOST_MULTIARCH}/some-package/*.so"
-W: debhelper-dh-exec source: dh-exec-script-without-dh-exec-features debian/dirs
+W: debhelper-dh-exec source: dh-exec-script-without-dh-exec-features debian/docs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: