diff -Nru lintian-2.5.101/checks/files.pm lintian-2.5.103/checks/files.pm --- lintian-2.5.101/checks/files.pm 2018-09-09 09:34:50.000000000 +0000 +++ lintian-2.5.103/checks/files.pm 2018-09-14 17:33:43.000000000 +0000 @@ -1494,7 +1494,7 @@ my $regex = $DOCUMENTATION_FILE_REGEX->value($taboo); if($file->basename =~ m{$regex}xi) { # see #904852 - next if $file->dirname =~ m{/templates/}; + next if $file->dirname =~ m{templates?(?:\.d)?/}; next if $file->basename =~ m{^README}xi and $file->file_contents =~ m{this directory}xi; diff -Nru lintian-2.5.101/data/fields/name_section_mappings lintian-2.5.103/data/fields/name_section_mappings --- lintian-2.5.101/data/fields/name_section_mappings 2018-09-09 09:34:50.000000000 +0000 +++ lintian-2.5.103/data/fields/name_section_mappings 2018-09-14 17:33:43.000000000 +0000 @@ -33,7 +33,7 @@ ^lib.*-(tcl|lua|gst)$ => interpreters # data files ^gir\d+\.\d+-.*-\d+\.\d+$ => introspection -^xfonts- => x11 +^xfonts- => fonts ^(?:fonts|ttf)- => fonts ^lib(?:nss|pam)- => admin ^(?:aspell|hunspell|myspell|mythes)- => localization diff -Nru lintian-2.5.101/debian/changelog lintian-2.5.103/debian/changelog --- lintian-2.5.101/debian/changelog 2018-09-09 09:34:50.000000000 +0000 +++ lintian-2.5.103/debian/changelog 2018-09-14 17:33:43.000000000 +0000 @@ -1,3 +1,31 @@ +lintian (2.5.103) unstable; urgency=medium + + + * private/refresh-manual-refs: + + [CL] Apply a patch series from Joseph Herlant to update some + locations of manual references. + + * t/helpers/bin/create-deb: + + [CL] Apply a patch from Felix Lechner to removed a likely-accidental + slash in a find(1) call. + + -- Chris Lamb Fri, 14 Sep 2018 17:33:43 +0000 + +lintian (2.5.102) unstable; urgency=medium + + * checks/files.pm: + + [CL] Ensure package-contains-documentation-outside-usr-share-doc also + excludes files in directories called (eg.) "autotools_templates" or + "my-templates.d". (Closes: #907734) + + * data/fields/name_section_mappings: + + [CL] Reclassify xfonts-foo packages as part of the "fonts" section as + nobody was doing this in practice. This reverts the change requested + in #878609 which was released inLintian 2.5.72. Thanks to Russ + Allbery. (Closes: #907725) + + -- Chris Lamb Tue, 11 Sep 2018 19:33:54 +0000 + lintian (2.5.101) unstable; urgency=medium * Summary of tag changes: @@ -32,7 +60,7 @@ + [CL] Update the long description of wrong-path-for-interpreter to reflect the weakening of the /usr/bin/perl "should" requirement and to use "particular" over "special exception". Thanks to David - Bremner. + Bremner. (Closes: #908350) * data/changelog-file/invalid-dates: + [CL] Merge patch from Josh Triplett to display the correct "short" diff -Nru lintian-2.5.101/private/refresh-manual-refs lintian-2.5.103/private/refresh-manual-refs --- lintian-2.5.101/private/refresh-manual-refs 2018-09-09 09:34:50.000000000 +0000 +++ lintian-2.5.103/private/refresh-manual-refs 2018-09-14 17:33:43.000000000 +0000 @@ -108,7 +108,7 @@ $dbk_fields ], 'vim-policy' => [ - '/usr/share/doc/vim-doc/vim-policy.html/index.html', + '/usr/share/doc/vim/vim-policy.html/index.html', 'http://pkg-vim.alioth.debian.org/vim-policy.html/', $dbk_index_re, $dbk_fields @@ -148,8 +148,8 @@ $fields ], 'fhs' => [ - '/usr/share/doc/debian-policy/fhs/fhs-2.3.html', - 'http://www.pathname.com/fhs/pub/fhs-2.3.html', + '/usr/share/doc/debian-policy/fhs/fhs-3.0.html', + 'http://www.pathname.com/fhs/pub/fhs-3.0.html', qr/([\w\s[:punct:]]+?)<\/a\s*>/i, [['section', 'url'], ['title']] ], diff -Nru lintian-2.5.101/t/helpers/bin/create-deb lintian-2.5.103/t/helpers/bin/create-deb --- lintian-2.5.101/t/helpers/bin/create-deb 2018-09-09 09:34:50.000000000 +0000 +++ lintian-2.5.103/t/helpers/bin/create-deb 2018-09-14 17:33:43.000000000 +0000 @@ -141,7 +141,7 @@ runsystem( join(q{ }, "cd $val{'root'}", - '&& find -type f -a -! -ipath etc/ -print0', + '&& find -type f -a -! -ipath etc -print0', "| xargs -0 md5sum >> $cwd/md5sums")); push @ARGV, 'md5sums' if -s 'md5sums'; # only add if it is not empty. } diff -Nru lintian-2.5.101/t/tests/fields-wrong-section/tags lintian-2.5.103/t/tests/fields-wrong-section/tags --- lintian-2.5.101/t/tests/fields-wrong-section/tags 2018-09-09 09:34:50.000000000 +0000 +++ lintian-2.5.103/t/tests/fields-wrong-section/tags 2018-09-14 17:33:43.000000000 +0000 @@ -19,4 +19,4 @@ I: python-fields-wrong-section: wrong-section-according-to-package-name python-fields-wrong-section => python I: python3-fields-wrong-section: wrong-section-according-to-package-name python3-fields-wrong-section => python I: r-cran-fields-wrong-section: wrong-section-according-to-package-name r-cran-fields-wrong-section => gnu-r -I: xfonts-fields-wrong-section1: wrong-section-according-to-package-name xfonts-fields-wrong-section1 => x11 +I: xfonts-fields-wrong-section1: wrong-section-according-to-package-name xfonts-fields-wrong-section1 => fonts diff -Nru lintian-2.5.101/t/tests/files-package-contains-foo/debian/debian/rules lintian-2.5.103/t/tests/files-package-contains-foo/debian/debian/rules --- lintian-2.5.101/t/tests/files-package-contains-foo/debian/debian/rules 2018-09-09 09:34:50.000000000 +0000 +++ lintian-2.5.103/t/tests/files-package-contains-foo/debian/debian/rules 2018-09-14 17:33:43.000000000 +0000 @@ -55,6 +55,10 @@ touch $(SHARE)/cargo/registry/crate-1.0.0/.gitignore touch $(SHARE)/cargo/registry/crate-1.0.0/LICENSE touch $(SHARE)/cargo/registry/crate-1.0.0/templates/readme.tmpl + mkdir -p $(SHARE)/cargo/registry/crate-1.0.0/foo_templates + touch $(SHARE)/cargo/registry/crate-1.0.0/foo_templates/readme.tmpl + mkdir -p $(SHARE)/cargo/registry/crate-1.0.0/my-templates.d + touch $(SHARE)/cargo/registry/crate-1.0.0/my-templates.d/readme.tmpl echo '#!/bin/sh' > $(SHARE)/cargo/registry/crate-1.0.0/test.sh echo '#!/usr/bin/python' > $(SHARE)/cargo/registry/crate-1.0.0/test.py chmod a+x $(SHARE)/cargo/registry/crate-1.0.0/test.py