[lintian] 01/01: Only warn about bad-jar-name for "public" .jar files. (Closes: #889628)

[Chris Lamb <chris@chris-lamb.co.uk>]

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

lamby pushed a commit to branch master
in repository lintian.

commit 29016192066d756160444a78b9a441865a4d39bd
Author: Chris Lamb <lamby@debian.org>
Date:   Mon Feb 5 10:19:56 2018 +0000

    Only warn about bad-jar-name for "public" .jar files. (Closes: #889628)
---
 checks/java.desc                                      | 6 +++---
 checks/java.pm                                        | 4 ++--
 debian/changelog                                      | 3 +++
 t/tests/java-jars/debian/debian/libtesta-java.install | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/checks/java.desc b/checks/java.desc
index 269975b..16e0e97 100644
--- a/checks/java.desc
+++ b/checks/java.desc
@@ -102,7 +102,7 @@ Info: The package contains a Jar file, but Lintian is unable to parse it.
 Tag: bad-jar-name
 Severity: normal
 Certainty: certain
-Info: The package contains a specified Jar file, but the name does not
- correspond to Java policy guidelines. This can cause tools in the Debian
- Java toolchain to fail.
+Info: The package ships the specified "public" Jar file under
+ <tt>/usr/share/java/</tt>, but the name does not correspond to Java policy
+ guidelines. This can cause tools in the Debian Java toolchain to fail.
 Ref: java-policy 2.4
diff --git a/checks/java.pm b/checks/java.pm
index 16b2fd6..32c4c8a 100644
--- a/checks/java.pm
+++ b/checks/java.pm
@@ -72,9 +72,9 @@ sub run {
         $has_jars = 1;
         if($jar_file =~ m#^usr/share/java/[^/]+\.jar$#o) {
             $has_public_jars = 1;
+            tag 'bad-jar-name', $jar_file
+              unless basename($jar_file) =~ /^$PKGNAME_REGEX\.jar$/;
         }
-        tag 'bad-jar-name', $jar_file
-          unless basename($jar_file) =~ /^$PKGNAME_REGEX\.jar$/;
         # check for common code files like .class or .clj (Clojure files)
         foreach
           my $class (grep { m/\.(?:class|cljc?)$/oi } sort keys %{$files}){
diff --git a/debian/changelog b/debian/changelog
index ae87ff1..452ba97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ lintian (2.5.74) UNRELEASED; urgency=medium
   * checks/fields.desc:
     + [CL] Downgrade severity of build-depends-on-obsolete-package from
       error to warning.  (Closes: #889638)
+  * checks/java.{desc,pm}:
+    + [CL] Only warn about bad-jar-name for "public" .jar files.
+      (Closes: #889628)
   * checks/patch-systems.pm:
     + [CL] Avoid emitting "Can't use an undefined value as an ARRAY
       reference" warnings when debian/patches is a file, not a directory.
diff --git a/t/tests/java-jars/debian/debian/libtesta-java.install b/t/tests/java-jars/debian/debian/libtesta-java.install
index a6483d5..cf31c45 100644
--- a/t/tests/java-jars/debian/debian/libtesta-java.install
+++ b/t/tests/java-jars/debian/debian/libtesta-java.install
@@ -1,3 +1,4 @@
 0.jar usr/share/java/
+0.jar usr/share/private-jars/
 testb.jar usr/lib/
 testc.jar usr/bin

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