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

[lintian] 03/03: Prevent a large number of false-positives when checking the debian-rules-is-dh_make-template tag. Thanks to Evgeni Golov for the report. (Closes: #890660)



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

lamby pushed a commit to branch master
in repository lintian.

commit 81060242e253c42321209e8ff4b12d0c2091786e
Author: Chris Lamb <lamby@debian.org>
Date:   Sat Feb 17 14:27:36 2018 +0000

    Prevent a large number of false-positives when checking the debian-rules-is-dh_make-template tag. Thanks to Evgeni Golov for the report. (Closes: #890660)
---
 checks/rules.pm                           | 2 +-
 debian/changelog                          | 3 +++
 t/tests/rules-general/debian/debian/rules | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/checks/rules.pm b/checks/rules.pm
index 0555205..fd8792e 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -178,7 +178,7 @@ sub run {
         my $line = $_;
 
         tag 'debian-rules-is-dh_make-template'
-          if $. == 2 and $line eq "# See debhelper(7) (uncomment to enable)\n";
+          if $line =~ m/dh_make generated override targets/;
 
         next if /^\s*\#/;
         if (m/^\s*[s-]?include\s+(\S++)/o){
diff --git a/debian/changelog b/debian/changelog
index 5c0a9f1..e6a5f1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ lintian (2.5.76) UNRELEASED; urgency=medium
     + [CL] Also check, for example, "override_dh_fixperms-indep" and
       "override_dh_fixperms-arch" targets for
       "override_dh_fixperms-does-not-call-dh_fixperms", etc.
+    + [CL] Prevent a large number of false-positives when checking the
+      debian-rules-is-dh_make-template tag.  Thanks to Evgeni Golov for
+      the report.  (Closes: #890660)
   * checks/scripts.pm:
     + [CL] Prevent some false-positives in udevadm-called-without-guard.
   * checks/watch-file.pm:
diff --git a/t/tests/rules-general/debian/debian/rules b/t/tests/rules-general/debian/debian/rules
index 0b01dc6..d6fa767 100755
--- a/t/tests/rules-general/debian/debian/rules
+++ b/t/tests/rules-general/debian/debian/rules
@@ -13,3 +13,8 @@ clean:
 	dh_clean
 	echo $(DEB_BUILD_OPTS) $(PWD)
 	@echo $(_)
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)

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


Reply to: