[java-wrappers] 23/61: [java-wrappers] Fix locate_jar for absolute paths

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java-wrappers.

commit 895cb1861b73e7723b5d4250045489fdce724493
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Wed Apr 29 17:21:44 2009 +0000

    [java-wrappers] Fix locate_jar for absolute paths
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 java-wrappers.sh | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ed0f08..8234bb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+java-wrappers (0.1.14) unstable; urgency=low
+
+  * Fix absolute path in locate_jar (closes: #526087). Thanks to Paul
+    Millar <paul.millar at desy.de> for spotting and for the patch.
+  * Conforms to 3.8.1
+
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 29 Apr 2009 19:13:40 +0200
+
 java-wrappers (0.1.13) unstable; urgency=low
 
   * Now that lenny is out, it's time to an upload to unstable !
diff --git a/debian/control b/debian/control
index c990c8a..563cbf0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-wrappers
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/java-wrappers
 
diff --git a/java-wrappers.sh b/java-wrappers.sh
index b253950..e08f212 100644
--- a/java-wrappers.sh
+++ b/java-wrappers.sh
@@ -178,11 +178,11 @@ locate_jar() {
     elif [ -r $jar ]; then
 	# Maybe issue a warning that jars should not be looked
 	# for absolutely ?
-	found_jar=$JAVA_JARPATH/$jar
+	found_jar=$jar
     elif [ -r $jar.jar ]; then
 	# Maybe issue a warning that jars should not be looked
 	# for absolutely ?
-	found_jar=$JAVA_JARPATH/$jar.jar
+	found_jar=$jar.jar
     else
 	return 1		# Not found
     fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-wrappers.git