[SCM] UNNAMED PROJECT branch, master, updated. 0.30-25-gf9a654e

[Matthew Johnson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  f9a654e5e3e15786cfc577d4eaef64931b913176 (commit)
      from  4b41e8f70b763075cbaf71fe00e1dafd9e6da554 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f9a654e5e3e15786cfc577d4eaef64931b913176
Author: Matthew Johnson <mjj29 at qadesh.matthew.ath.cx>
Date:   Fri Jul 2 22:31:31 2010 +0100

    fix for 586783

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    7 ++++++-
 jh_depends       |    2 ++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c54193..ab6a11f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 javatools (0.32) UNRELEASED; urgency=low
 
+  [ Niels Thykier ]
   * Fixed quoting issue in jh_compilefeatures.
   * Created Debian::Javahelper::Java perl module to assist jh_depends
     with finding linked javadocs.
@@ -26,7 +27,11 @@ javatools (0.32) UNRELEASED; urgency=low
     which system javadocs they have been linked against. These packages
     are added to the new ${java:Recommends} variable.
 
- -- Niels Thykier <niels at thykier.net>  Wed, 23 Jun 2010 16:16:59 +0200
+  [ Matthew Johnson ]
+  * If jars aren't specified by absolute path try finding them under
+    /usr/share/java (Closes: #586783)
+
+ -- Matthew Johnson <mjj29 at debian.org>  Fri, 02 Jul 2010 22:29:58 +0100
 
 javatools (0.31) unstable; urgency=low
 
diff --git a/jh_depends b/jh_depends
index 48066cf..1bce83c 100755
--- a/jh_depends
+++ b/jh_depends
@@ -149,6 +149,8 @@ for p in $PACKAGES; do
    for i in $JARDEPS; do
 		if [ -e "$i" ]; then 
 			realjar="`readlink -f "$i"`"
+		elif [ -e "/usr/share/java/$i" ]; then
+			realjar="`readlink -f "/usr/share/java/$i"`"
 		else
 			realjar="$i"
 		fi


hooks/post-receive
-- 
UNNAMED PROJECT