[SCM] UNNAMED PROJECT branch, master, updated. 0.30-26-g32ea17e

[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  32ea17ed0eb138f46aa3478515c26fc2095bde0d (commit)
      from  f9a654e5e3e15786cfc577d4eaef64931b913176 (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 32ea17ed0eb138f46aa3478515c26fc2095bde0d
Author: Matthew Johnson <mjj29 at qadesh.matthew.ath.cx>
Date:   Sun Jul 4 09:33:28 2010 +0100

    jh_build add -link on all packages you depend on

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

Summary of changes:
 debian/changelog |    4 +++-
 jh_build         |    6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab6a11f..dbee893 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,10 @@ javatools (0.32) UNRELEASED; urgency=low
   [ Matthew Johnson ]
   * If jars aren't specified by absolute path try finding them under
     /usr/share/java (Closes: #586783)
+  * jh_build will now -link any javadoc in a package that you build-depend
+    on
 
- -- Matthew Johnson <mjj29 at debian.org>  Fri, 02 Jul 2010 22:29:58 +0100
+ -- Matthew Johnson <mjj29 at debian.org>  Sun, 04 Jul 2010 09:32:42 +0100
 
 javatools (0.31) unstable; urgency=low
 
diff --git a/jh_build b/jh_build
index 426c943..37b2f76 100755
--- a/jh_build
+++ b/jh_build
@@ -86,11 +86,7 @@ function dobuild()
 		echo "Debian-Java-Home: $JAVA_HOME" >> debian/_jh_manifest.$ext
 	fi
 
-	if [ -d /usr/share/doc/default-jdk-doc/api ]; then
-		CLASSPATHDOCS="-link /usr/share/doc/default-jdk-doc/api"
-	else
-		CLASSPATHDOCS=
-	fi
+   CLASSPATHDOCS="`for i in $(grep-dctrl --no-field-names --show-field Build-Depends,Build-Depends-Indep -F source "$pkg" debian/control | tr , ' ' | sed 's/([^)]*)//g') ; do dpkg -L $i 2>/dev/null | grep /usr/share/doc/.*/api$; done | sed 's/^/-link /' | xargs`"
 
 	mkdir -p debian/_jh_build.$ext
 	if [ -n "$srcdirs" ]; then


hooks/post-receive
-- 
UNNAMED PROJECT