[SCM] UNNAMED PROJECT branch, master, updated. 0.31-64-g06bfd19

[Niels Thykier]

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  06bfd192ff2c7d640cf81d13dd06d2303ec8c54b (commit)
       via  8f6544e4c1d34cb761efd81fcfbcbda7b7156a20 (commit)
      from  c5116b9667ffe5d8a2217301c11e42bc173a763b (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 06bfd192ff2c7d640cf81d13dd06d2303ec8c54b
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 16 10:10:06 2011 +0200

    Updated the changelog to reflect my recent changes

commit 8f6544e4c1d34cb761efd81fcfbcbda7b7156a20
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 16 10:03:36 2011 +0200

    Use first package for jh_classpath with jar args

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

Summary of changes:
 debian/changelog |    4 ++++
 jh_classpath     |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18075ca..04fc672 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,10 @@ javatools (0.33) unreleased; urgency=low
   * Added missing B-D-I on perl (for pod2man).
   * Migrated jh_generateorbitdir to the perl Manifest handler.
   * Fixed typo in jh_generateorbitdir and in jh_compilefeatures.
+  * Fixed jh_classpath, which was horribly broken after the 0.32 upload.
+    - It now adds debian/<pkg> automatically if it appears to be needed.
+  * Updated file suggestions for jh_classpath and added a note about
+    the sequence change in the tutorial.
 
  -- Matthew Johnson <mjj29 at debian.org>  Sat, 12 Mar 2011 12:58:50 +0000
 
diff --git a/jh_classpath b/jh_classpath
index 7141718..010f5a1 100755
--- a/jh_classpath
+++ b/jh_classpath
@@ -64,8 +64,12 @@ else
 	# process jars with -c or $CLASSPATH
 	for (( i=0 ; i<ARGC; i++ )); do
 		jar=${ARGV[i]}
+                p=$(firstpackage)
 		if [ -f "$jar" ]; then
 			cpath="`getarg c classpath`"
+			if [ ! -f "$jar" ] ; then
+				jar="debian/$p/$jar"
+                        fi
 			if [ -z "$cpath" ]; then
 				cpath="`sed 's/:/ /g' <<< $CLASSPATH`"
 			fi


hooks/post-receive
-- 
UNNAMED PROJECT