[SCM] Debian package checker branch, master, updated. 2.5.1-154-gc897c9b

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit c897c9b38a587f0da503d4b7dbe0e91e2778a35d
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 27 21:51:03 2011 +0200

    Exclude jar files in xulrunner dirs from "jar not in usr/share"
    
    This is a redo of the previous commit; I read the bug log wrong.
    Thanks to Jakub Wilk for catching that and suggesting the path
    based solution.

diff --git a/checks/java b/checks/java
index fdc291d..13f9329 100644
--- a/checks/java
+++ b/checks/java
@@ -59,10 +59,11 @@ for my $jar_file (sort keys %{$java_info}) {
     my $datafiles = 1;
     my $cp = '';
     my $bsname = '';
-    my $xpi = 0;
 
     # The Java Policy says very little about requires for (jars in) JVMs
     next if $jar_file =~ m#usr/lib/jvm(?:-exports)?/[^/]++/#o;
+    # Ignore Mozilla's jar files, see #635495
+    next if $jar_file =~ m#usr/lib/xul(?:-ext|runner[^/]*+)/#o;
 
     $jar_dir = $jar_file;
     $jar_dir =~ s,[^/]+$,,o;
@@ -73,7 +74,6 @@ for my $jar_file (sort keys %{$java_info}) {
     }
     # check for common code files like .class or .clj (Clojure files)
     $classes = 0 unless grep m/\.(?:class|clj)$/oi, @{$file_list};
-    $xpi = 1 if grep m/\.xpi$/oi, @{$file_list};
     $datafiles = 0
         unless grep m/\.(?:xml|properties|x?html|xhp)$/io, @{$file_list};
 
@@ -88,9 +88,7 @@ for my $jar_file (sort keys %{$java_info}) {
             unless $info->relation('strong')->implies('jarwrapper');
     }
     elsif ($jar_file !~ m#^usr/share/#) {
-        # XPI files are architecture dependent,
-        # see #635495
-	tag 'jar-not-in-usr-share', $jar_file unless $xpi;
+	tag 'jar-not-in-usr-share', $jar_file;
     }
 
     $cp = $manifest->{'Class-Path'}//'' if $manifest;
diff --git a/debian/changelog b/debian/changelog
index 034517e..2d82500 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,7 +108,7 @@ lintian (2.5.2) UNRELEASED; urgency=low
   * checks/java:
     + [NT] Jar files containing clojure files are no longer
       considered to be codeless.
-    + [NT] Exclude jar files containing xpi files from the
+    + [NT] Exclude jar files in /usr/lib/xul{-ext,runner} from the
       "jar-not-in-usr-share" check.  (Closes: #635495)
   * checks/menu-format.desc:
     + [NT] Mentioned how to git rid of the CR characters in the

-- 
Debian package checker