[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: Look under all of /usr/share/doc (not just /usr/share/doc/$pkg) when looking for installed examples and update tag description to match. (Closes: #892905)



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit 7f31cecc92b013987d1e0aa746e271f4630878b8
Author: Chris Lamb <lamby@debian.org>
Date:   Thu Mar 15 18:13:55 2018 -0700

    Look under all of /usr/share/doc (not just /usr/share/doc/$pkg) when looking for installed examples and update tag description to match. (Closes: #892905)
---
 checks/cruft.desc | 3 +++
 checks/cruft.pm   | 2 +-
 debian/changelog  | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/checks/cruft.desc b/checks/cruft.desc
index d9f0627..0574fd0 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -946,6 +946,9 @@ Info: The original source tarball contains the specified examples
  Please use <tt>dh_installexamples</tt> to install these to the most
  relevant package, for example by adding the directory name to a
  <tt>debian/pkgname.examples</tt> file.
+ .
+ Lintian looks for any directory called <tt>examples</tt> under
+ <tt>/usr/share/doc</tt> in all binary packages.
 Ref: dh_installexamples(1)
 
 Tag: package-uses-deprecated-source-override-location
diff --git a/checks/cruft.pm b/checks/cruft.pm
index 2409fe3..9bdb20d 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -1579,7 +1579,7 @@ sub _ships_examples {
         return 1 if $name =~ m{-examples$};
         my @files = $binpkg->info->sorted_index;
         return 1
-          if any { m{^usr/share/doc/\Q$name\E/(.+/)?examples/$} } @files;
+          if any { m{^usr/share/doc/(.+/)?examples/$} } @files;
     }
     return;
 }
diff --git a/debian/changelog b/debian/changelog
index e20e2ed..1d2beb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,13 @@ lintian (2.5.80) UNRELEASED; urgency=medium
     + [CL] Drop apache2-module-depends-on-real-apache2-package tag as there
       are separate tags for missing apache2-api-* dependencies.  Thanks to
       Thijs Kinkhorst et al.  (Closes: #796285)
-  * checks/cruft.pm:
+  * checks/cruft.{desc,pm}:
     + [CL] Strip \par elements from files prior to license checks to
       avoid false-positives when checking .rtf files.  Thanks to Adam
       Borowski for the report and testcase.  (Closes: #892967)
+    + [CL] Look under all of /usr/share/doc (not just /usr/share/doc/$pkg)
+      when looking for installed examples and update tag description to
+      match.  Thanks to Ferenc Wágner for the report.  (Closes: #892905)
   * checks/fields.pm:
     + [CL] Only check dependency fields in binary packages for
       mail-transport-agent-dependency-does-not-specify-default-mta etc.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: