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

[SCM] Debian package checker branch, master, updated. 2.5.6-131-gc32df9a



The following commit has been merged in the master branch:
commit c32df9a59e297ca7ab4d6ab394bdcdb48bc7fadc
Author: Ludovic Claude <ludovic.claude@laposte.net>
Date:   Sun May 13 16:55:30 2012 +0200

    c/java: codeless-jars - Ignore maven javadoc jars
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/java b/checks/java
index 2f8a893..2b7a5b9 100644
--- a/checks/java
+++ b/checks/java
@@ -97,7 +97,9 @@ for my $jar_file (sort keys %{$java_info}) {
 
             # Eclipse / OSGi bundles are sometimes source bundles
             #   these do not ship classes but java files and other sources.
-            if ($bsname !~ m/\.source$/o || $cp) {
+            # Javadoc jars deployed in the Maven repository also do not ship
+            #   classes but HTML files, images and CSS files
+            if (($bsname !~ m/\.source$/o && $jar_file !~ m#^usr/share/maven-repo/.*-javadoc\.jar#) || $cp) {
                 tag 'codeless-jar', $jar_file;
             }
         }
diff --git a/debian/changelog b/debian/changelog
index 492533d..8803bf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -104,6 +104,10 @@ lintian (2.5.7) UNRELEASED; urgency=low
   * checks/group-checks:
     + [NT] Include Provides when checking for conflict relations.
       Thanks to Damyan Ivanov for the report.  (Closes: #672615)
+  * checks/java:
+    + [NT] Ignore "codeless" jars if they appear to be maven
+      javadoc jars.  Thanks to Ludovic Claude for the patch.
+      (Closes: #660845)
   * checks/lintian.desc:
     + [NT] Updated the description of the override tags.
   * checks/manpages{,.desc}:

-- 
Debian package checker


Reply to: