This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit 18ec65d3fbcf5bf492687ac60a297a489b3dd867 Author: Chris Lamb <[email protected]> Date: Mon Jul 10 17:19:16 2017 +0100 [CL] Move r-data-without-readme-source to check the source package, not the binary. (Closes: #866322) --- checks/cruft.desc | 11 +++++++++++ checks/cruft.pm | 7 +++++++ checks/files.desc | 11 ----------- checks/files.pm | 9 --------- debian/changelog | 3 +++ t/tests/files-r-data/tags | 8 ++++---- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/checks/cruft.desc b/checks/cruft.desc index 31a3d31..d6ea92a 100644 --- a/checks/cruft.desc +++ b/checks/cruft.desc @@ -867,3 +867,14 @@ Info: The debian/README.source file appears to be an unmodified or insufficientl . Please double-check the README.source page and replace it with information about this source package or simply remove the file completely. + +Tag: r-data-without-readme-source +Severity: important +Certainty: certain +Info: Many modules packaged for the R Project for Statistical Computing contain + data files with names as *.rda, *.Rda, *.rdata, *.Rdata, etc. + . + When such files exist, the FTP masters expect them to be explained in + debian/README.source, which this package is missing. + . + Please add a README.source documenting the origins of these files. diff --git a/checks/cruft.pm b/checks/cruft.pm index 81faea6..028919e 100644 --- a/checks/cruft.pm +++ b/checks/cruft.pm @@ -651,6 +651,13 @@ sub find_cruft { tag 'source-contains-prebuilt-ms-help-file', $name; } + # Ensure we have a README.source for R data files + if ( $basename =~ m,\.(?:rda|Rda|rdata|Rdata)$, + && $entry->is_file + && !$info->index_resolved_path('debian/README.source')) { + tag 'r-data-without-readme-source', $name; + } + # Lena Söderberg image if ($basename =~ /\blenn?a\b/i) { if( $file_info =~ /\bimage\b/i diff --git a/checks/files.desc b/checks/files.desc index ff2f227..7113ac3 100644 --- a/checks/files.desc +++ b/checks/files.desc @@ -1741,14 +1741,3 @@ Info: The package is architecture-dependent, ships a shared library in same package, but this package does not contain any programs. . Please remove the <tt>Multi-Arch: foreign</tt> stanza. - -Tag: r-data-without-readme-source -Severity: important -Certainty: certain -Info: Many modules packaged for the R Project for Statistical Computing contain - data files with names as *.rda, *.Rda, *.rdata, *.Rdata, etc. - . - When such files exist, the FTP masters expect them to be explained in - debian/README.source, which this package is missing. - . - Please add a README.source documenting the origins of these files. diff --git a/checks/files.pm b/checks/files.pm index 32f89a9..e49bfde 100644 --- a/checks/files.pm +++ b/checks/files.pm @@ -743,15 +743,6 @@ sub run { } } - # ---------------- /usr/lib/R/site-library - elsif ($fname =~ m,^usr/lib/R/site-library/\S,) { - if ( $file->is_file - && $file =~ m,\.(?:rda|Rda|rdata|Rdata)$, - && !$info->index_resolved_path('debian/README.source')) { - tag 'r-data-without-readme-source', $file; - } - } - # ---------------- /usr/lib/sgml elsif ($fname =~ m,^usr/lib/sgml/\S,) { tag 'file-in-usr-lib-sgml', $file; diff --git a/debian/changelog b/debian/changelog index 012d69b..2bd3e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ lintian (2.5.52) UNRELEASED; urgency=medium description; there exists free software to generate .chm files. + [CL] Don't emit source-contains-prebuilt-ms-help-file for files generated by Halibut. (Closes: #867673) + + [CL] Move r-data-without-readme-source to check the source package, + no the binary; the expected README.source files are not installed + in binary packages. (Closes: #866322) * checks/fields.{desc,pm}: + [NT] Remove check for missing versioned build-depends for dpkg and debhlper when using Build-Profiles. The necessary versions diff --git a/t/tests/files-r-data/tags b/t/tests/files-r-data/tags index 1a03bbd..3b662fb 100644 --- a/t/tests/files-r-data/tags +++ b/t/tests/files-r-data/tags @@ -1,4 +1,4 @@ -E: files-r-data: r-data-without-readme-source usr/lib/R/site-library/files-r-data/test.Rda -E: files-r-data: r-data-without-readme-source usr/lib/R/site-library/files-r-data/test.Rdata -E: files-r-data: r-data-without-readme-source usr/lib/R/site-library/files-r-data/test.rda -E: files-r-data: r-data-without-readme-source usr/lib/R/site-library/files-r-data/test.rdata +E: files-r-data source: r-data-without-readme-source src/test.Rda +E: files-r-data source: r-data-without-readme-source src/test.Rdata +E: files-r-data source: r-data-without-readme-source src/test.rda +E: files-r-data source: r-data-without-readme-source src/test.rdata -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
