[SCM] UNNAMED PROJECT branch, master, updated. 0.43-9-g7b6ab0b

[Niels Thykier]

The following commit has been merged in the master branch:
commit 9732381a1f4efd7662339698778bcbf7db91c422
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Thu Apr 25 20:50:33 2013 +0200

    jh_installeclipse: correct dpkg -l filter
    
    Allow any installed package to provide a .jar dependency, not just
    those with desired-state install
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index b225512..8f54008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ javatools (0.44) UNRELEASED; urgency=low
   * Fix the output path for javadoc generated by jh_build.
     Thanks to Jakub Adam for reporting it and writing the
     patch. (Closes: #692230)
+  * jh_installeclipse: Allow any installed package to
+    provide a .jar dependency, not just those with
+    desired-state install.  Thanks to Colin Watson for the
+    patch (pulled from Ubuntu's javatools/0.43ubuntu2).
 
  -- Niels Thykier <niels at thykier.net>  Wed, 20 Mar 2013 14:40:31 +0100
 
diff --git a/jh_installeclipse b/jh_installeclipse
index a74f0ec..9e5730a 100755
--- a/jh_installeclipse
+++ b/jh_installeclipse
@@ -189,7 +189,7 @@ sub find_dependency{
 	open(my $dfd, '-|', 'dpkg', '-l');
 	while( chomp(my $line = <$dfd>) ){
 	    my ($pname, $version);
-	    next if($line !~ m/^ii/o);
+	    next if ($line !~ m/^.i/o);
 	    (undef, $pname, $version, undef) = split(/\s++/o, $line);
 	    if(exists($pkgtable{$pname})){
 		$deppkg = $pname;

-- 
UNNAMED PROJECT