[SCM] Debian package checker branch, master, updated. 2.5.12-82-gf1ade7b

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

The following commit has been merged in the master branch:
commit f1ade7bc97f8055ca982d24f98da756e97ecae0c
Author: Niels Thykier <niels@thykier.net>
Date:   Sun May 19 18:42:44 2013 +0200

    coll/java-info: file(1) now uses "Java Jar file"
    
    Update java-info to cope with file(1) calling a JAR file for "Java Jar
    file" (previously, it was called a "Zip archive").
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/java-info b/collection/java-info
index 26d8604..955c178 100755
--- a/collection/java-info
+++ b/collection/java-info
@@ -78,7 +78,10 @@ FILE:
 foreach my $file ($info->sorted_index) {
     my $ftype = $info->index ($file);
     next unless $ftype->is_file;
-    next unless $info->file_info ($file) =~ m/Zip archive/o;
+    # Wheezy's version of file calls "jar files" for "Zip archive".
+    # Newer versions seem to call them "Java Jar file".
+    next unless $info->file_info($file) =~ m/Java Jar file|Zip archive/o;
+
     if ($file =~ m#\S+\.jar$#i) {
         my $has_manifest = 0;
         my $manifest;
diff --git a/debian/changelog b/debian/changelog
index a6fb748..6bfa148 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,10 @@ lintian (2.5.13) UNRELEASED; urgency=low
   * collection/debfiles:
     + [NT] Replace makeshift "is_ancestor_of" check with the
       one from L::Util.
+  * collection/java-info:
+    + [NT] Update a regex to cope with file(1) now calling JAR files
+      for "Java Jar file" rather than "Zip archive".
+      (Closes: #707400)
 
   * data/changes-file/known-dists:
     + [NT] Add jessie and remove lenny.

-- 
Debian package checker