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

[lintian] 01/02: c/debhelper: Improve the debian-build-system detection



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

nthykier pushed a commit to branch master
in repository lintian.

commit d98d72072fc1e5bd47c3aeb5782c5a911746ce2e
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jul 31 14:23:51 2016 +0000

    c/debhelper: Improve the debian-build-system detection
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/debhelper.pm | 13 +++++++++++++
 debian/changelog    |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index 7dffa72..5ffac1b 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -196,6 +196,19 @@ sub run {
             $inclcdbs = 1;
             $build_systems{'cdbs-without-debhelper.mk'} = 1
               if not exists($build_systems{'cdbs-with-debhelper.mk'});
+        } elsif (
+            m{
+              ^include \s+
+                 /usr/share/(?:
+                   dh-php/pkg-pecl\.mk
+                  |pkg-kde-tool/qt-kde-team/\d+/debian-qt-kde\.mk
+                  |blends-dev/rules
+                 )
+              }xsm
+          ) {
+            # All of these indirectly use dh.
+            $build_systems{'dh'} = 1;
+            delete($build_systems{'debhelper'});
         }
     }
     close($rules_fd);
diff --git a/debian/changelog b/debian/changelog
index 2970d51..21d9246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ lintian (2.5.46) UNRELEASED; urgency=medium
   * checks/debhelper.{desc,pm}:
     + [JW] Apply patch from Chris Lamb to check for common typos in
       debian/rules target names.  (Closes: #832096)
+    + [JW, NT] Add some more (indirect) "dh" build-systems.
+      (Closes: #828773)
   * checks/scripts.pm:
     + [JW] Fix false positive unusual-interpreter when the script had
       "#!/usr/bin/env" shebang and the interpreter was shipped in the same

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


Reply to: