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

[SCM] Debian package checker branch, master, updated. 2.5.0-rc3-31-g02c3382



The following commit has been merged in the master branch:
commit 02c338255ae7ce469848a892a2668cf6e66cc438
Author: Niels Thykier <niels@thykier.net>
Date:   Fri May 6 11:37:22 2011 +0200

    Remove libX-java-doc before extracting libX-java from Depends
    
    This allows a slightly less strict regex for extracting libX-java
    without it taking libX-java-doc as a java library.

diff --git a/checks/java b/checks/java
index 06bc10d..0b57233 100644
--- a/checks/java
+++ b/checks/java
@@ -40,8 +40,12 @@ my $has_osgi = 0;
 my $has_public_jars = 0;
 my $has_jars = 0;
 
-my @java_lib_depends = ($info->relation('strong')->unparse() =~
-			/^lib[^\s,]+-java$/g);
+my $depends = $info->relation('strong')->unparse();
+# Remove all libX-java-doc packages to avoid thinking they are java libs
+#  - note the result may not be a valid dependency listing
+$depends =~ s/lib[^\s,]+-java-doc//go;
+
+my @java_lib_depends = ($depends =~ m/\b(lib[^\s,]+-java)\b/og);
 
 # We first loop over jar files to find problems
 

-- 
Debian package checker


Reply to: