[lintian] 01/01: c/debhelper: The r-cran.mk file implies cdbs's debhelper.mk
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 1c393121669b25ba812123673ffa981cdb3b7a64
Author: Niels Thykier <niels@thykier.net>
Date: Tue Apr 26 21:02:00 2016 +0000
c/debhelper: The r-cran.mk file implies cdbs's debhelper.mk
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/debhelper.pm | 6 +++---
debian/changelog | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index f9e1251..2bb76fc 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -155,7 +155,8 @@ sub run {
$seen_python_helper = 1;
$seen_python3_helper = 1;
}
- } elsif (m,^include\s+/usr/share/cdbs/1/rules/debhelper.mk,) {
+ } elsif (m,^include\s+/usr/share/cdbs/1/rules/debhelper.mk,
+ or m,^include\s+/usr/share/R/debian/r-cran.mk,o) {
$build_systems{'cdbs-with-debhelper.mk'} = 1;
delete($build_systems{'cdbs-without-debhelper.mk'});
$seencommand = 1;
@@ -177,8 +178,7 @@ sub run {
$level = $1 if ($level);
} elsif (/^override_dh_/) {
$needbuilddepends = 1;
- } elsif (m,^include\s+/usr/share/cdbs/,
- or m,^include\s+/usr/share/R/debian/r-cran.mk,o) {
+ } elsif (m,^include\s+/usr/share/cdbs/,) {
$inclcdbs = 1;
$build_systems{'cdbs-without-debhelper.mk'} = 1
if not exists($build_systems{'cdbs-with-debhelper.mk'});
diff --git a/debian/changelog b/debian/changelog
index 9ddd00e..030547e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lintian (2.5.45) UNRELEASED; urgency=medium
XXX: generate tag summary with private/generate-tag-summary
+ * checks/debhelper.pm:
+ + [NT] The /usr/share/R/debian/r-cran.mk file implies
+ /usr/share/cdbs/1/rules/debhelper.mk.
* checks/info-files.desc:
+ [NT] Use "gzip -9n" rather than "gzip -9" in examples.
* checks/manpages.desc:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: