[SCM] Debian package checker branch, master, updated. 2.5.1-153-gbf3bcaf

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

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

    Exclude jars containing .xpi files from "not in usr/share" check

diff --git a/checks/java b/checks/java
index b7e5da6..fdc291d 100644
--- a/checks/java
+++ b/checks/java
@@ -59,6 +59,7 @@ 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;
@@ -71,9 +72,10 @@ for my $jar_file (sort keys %{$java_info}) {
 	$has_public_jars = 1;
     }
     # check for common code files like .class or .clj (Clojure files)
-    $classes = 0 unless grep m/\.(?:class|clj)$/o, @{$file_list};
+    $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)$/o, @{$file_list};
+        unless grep m/\.(?:xml|properties|x?html|xhp)$/io, @{$file_list};
 
     if($operm & 0111) {
 	# Executable ?
@@ -86,7 +88,9 @@ for my $jar_file (sort keys %{$java_info}) {
             unless $info->relation('strong')->implies('jarwrapper');
     }
     elsif ($jar_file !~ m#^usr/share/#) {
-	tag 'jar-not-in-usr-share', $jar_file;
+        # XPI files are architecture dependent,
+        # see #635495
+	tag 'jar-not-in-usr-share', $jar_file unless $xpi;
     }
 
     $cp = $manifest->{'Class-Path'}//'' if $manifest;
diff --git a/debian/changelog b/debian/changelog
index 5e32a44..034517e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,6 +108,8 @@ 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
+      "jar-not-in-usr-share" check.  (Closes: #635495)
   * checks/menu-format.desc:
     + [NT] Mentioned how to git rid of the CR characters in the
       desktop file.  Thanks to Jakub Wilk.

-- 
Debian package checker