[lintian] 01/01: coll/java-info: file(1) changed output for JAR files again
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 87e5ebd0197578fcedfcfc7a8fe1c752b145c32f
Author: Niels Thykier <niels@thykier.net>
Date: Sat Feb 22 09:24:09 2014 +0100
coll/java-info: file(1) changed output for JAR files again
Signed-off-by: Niels Thykier <niels@thykier.net>
---
collection/java-info | 6 +++++-
debian/changelog | 4 ++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/collection/java-info b/collection/java-info
index 8394aea..9fef72e 100755
--- a/collection/java-info
+++ b/collection/java-info
@@ -81,7 +81,11 @@ sub collect {
next unless $file->is_file;
# 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;
+ # Jessie also introduced "Java archive data (JAR)"...
+ next unless $info->file_info($file) =~ m/
+ Java [ ] (?:Jar [ ] file|archive [ ] data)
+ | Zip [ ] archive
+ | JAR /xo;
if ($file =~ m#\S+\.jar$#i) {
my $filename = $file->name;
diff --git a/debian/changelog b/debian/changelog
index ade4cf4..4b56def 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ lintian (2.5.22) UNRELEASED; urgency=medium
+ [BR] Allow debian/upstream-signing-key.asc,
thanks to Nicolas Boulenguez (Closes: #736711).
+ * collection/java-info:
+ + [NT] Update the conditional using file(1) to cope with
+ the new output for JAR files.
+
* data:
+ [NT] Refresh several architecture data files against
dpkg 1.17.5. Thanks to James Hunt for the reminder.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: