[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: c/debhelper: Allow dh-exec-install in ".manpages" files



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 281d480bec45e55b54953f0b0b0d41a00b540e7f
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jun 15 17:10:19 2015 +0200

    c/debhelper: Allow dh-exec-install in ".manpages" files
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/debhelper.desc | 6 +++---
 checks/debhelper.pm   | 2 +-
 debian/changelog      | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index e1aae94..3c76579 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -290,11 +290,11 @@ Info: The package uses dh-exec in at least one of its files, but does
 Tag: dh-exec-install-not-allowed-here
 Severity: important
 Certainty: possible
-Info: The package uses a dh-exec-install construct in a non-.install
- file.
+Info: The package uses a dh-exec-install construct in a debhelper
+ config file, where it is not permitted.
  .
  The dh-exec-install constructs are only allowed in dh_install's
- .install files, and nowhere else.
+ .install and dh_installman's .manpages files, and nowhere else.
 
 Tag: dh-exec-subst-unknown-variable
 Severity: minor
diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index 8ee77ee..f0d9c40 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -505,7 +505,7 @@ sub _check_dh_exec {
         tag 'dh-exec-script-without-dh-exec-features', $path;
     }
 
-    if ($dhe_install && $base ne 'install') {
+    if ($dhe_install && ($base ne 'install' && $base ne 'manpages')) {
         tag 'dh-exec-install-not-allowed-here', $path;
     }
     return;
diff --git a/debian/changelog b/debian/changelog
index c49ab10..133000a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ lintian (2.5.32) UNRELEASED; urgency=medium
   * checks/debhelper.{desc,pm}:
     + [NT] Warn about using dh --{until,before,after,remaining} as
       these are deprecated and have been since debhelper/8.9.4.
+    + [NT] Permit the use of dh-exec-install in ".manpages" as well
+      since dh-exec now advertises this as acceptable.  Thanks to
+      Andreas Henriksson for reporting this.  (Closes: #788796)
   * checks/fields.pm:
     + [BR] Detect double comma in  uploaders fields.
       (Closes: #783628).

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: