This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit 990d13bd660af78cd8c3e781cfbee2c70bb90cff Author: Chris Lamb <la...@debian.org> Date: Mon Jan 1 14:36:39 2018 +0000 Don't warn about extra license files installed via Sphinx. Thanks, Stuart Prescott! (Closes: #885968) --- checks/files.pm | 2 ++ debian/changelog | 2 ++ t/tests/files-extra-license/debian/_sources/license.rst | 1 + t/tests/files-extra-license/debian/_sources/license.rst.txt | 1 + t/tests/files-extra-license/debian/debian/docs | 1 + 5 files changed, 7 insertions(+) diff --git a/checks/files.pm b/checks/files.pm index f725677..69e4ed0 100644 --- a/checks/files.pm +++ b/checks/files.pm @@ -1305,6 +1305,8 @@ sub run { # base-files (which is required to ship them) and not $fname =~ m,^usr/share/common-licenses/[^/]+$,o and not defined $link + # Sphinx includes license files + and not $fname =~ m,/_sources/license\.rst(\.txt)?$,o ) { # okay, we cannot rule it out based on file name; but if diff --git a/debian/changelog b/debian/changelog index 36d954d..0054b28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ lintian (2.5.67) UNRELEASED; urgency=medium * checks/files.pm: + [CL] Split out python-module-has-overly-generic-name regular expression into a data file. + + [CL] Don't warn about extra license files installed via Sphinx. + Thanks, Stuart Prescott! (Closes: #885968) * checks/python.pm: + [CL] Prevent false positives when checking for Python {2,3} packages that depend on Python {3,2} packages when the package being depended diff --git a/t/tests/files-extra-license/debian/_sources/license.rst b/t/tests/files-extra-license/debian/_sources/license.rst new file mode 100644 index 0000000..473e105 --- /dev/null +++ b/t/tests/files-extra-license/debian/_sources/license.rst @@ -0,0 +1 @@ +Lintian should pick up this as an extra license file. diff --git a/t/tests/files-extra-license/debian/_sources/license.rst.txt b/t/tests/files-extra-license/debian/_sources/license.rst.txt new file mode 100644 index 0000000..473e105 --- /dev/null +++ b/t/tests/files-extra-license/debian/_sources/license.rst.txt @@ -0,0 +1 @@ +Lintian should pick up this as an extra license file. diff --git a/t/tests/files-extra-license/debian/debian/docs b/t/tests/files-extra-license/debian/debian/docs index 7364196..78a4374 100644 --- a/t/tests/files-extra-license/debian/debian/docs +++ b/t/tests/files-extra-license/debian/debian/docs @@ -1,2 +1,3 @@ license* bsd.yml +_sources -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git