[SCM] Debian package checker branch, master, updated. 2.5.2-46-g7a615da
The following commit has been merged in the master branch:
commit 7a615daaff4999aa8fc7492319b8e6d4a0ea569e
Author: Niels Thykier <niels@thykier.net>
Date: Sun Aug 21 15:36:50 2011 +0200
Recognise /usr/share/R/debian/r-cran.mk as a cdbs-based build
diff --git a/checks/debhelper b/checks/debhelper
index f1ecb63..8806504 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -167,7 +167,7 @@ while (<RULES>) {
} elsif (/^override_dh_/) {
$needbuilddepends = 1;
$overridetargets = 1;
- } elsif (m,^include\s+/usr/share/cdbs/,){
+ } elsif (m,^include\s+/usr/share/cdbs/, or m,^include\s+/usr/share/R/debian/r-cran.mk,o){
$inclcdbs = 1;
}
}
diff --git a/debian/changelog b/debian/changelog
index ae25fa4..3f21e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ lintian (2.5.3) UNRELEASED; urgency=low
LANG. (Closes: #637595)
* checks/{conffile,etcfiles}{,.desc}:
+ [JW] Merged etcfiles into conffile. (Closes: #637590)
+ * checks/debhelper:
+ + [NT] Recognise /usr/share/R/debian/r-cran.mk as a cdbs-based
+ build. This prevents false-positive "unneeded cdbs" warning.
* checks/duplicate-files{,.desc}:
+ [NT] Replace the exception for "__init__.py" files by excluding
all empty files from the check. The bug (#632789) only requests
--
Debian package checker
Reply to: