[clojure] 02/03: Fix javahelper usage

[Elana Hashman]

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

ehashman-guest pushed a commit to branch master
in repository clojure.

commit 6339e6bc8b71028204289428b6bd0f7d33306745
Author: Elana Hashman <ehashman at debian.org>
Date:   Tue Feb 27 18:26:59 2018 -0500

    Fix javahelper usage
---
 debian/changelog                 | 1 +
 debian/clojure.classpath         | 1 -
 debian/control                   | 3 +--
 debian/libclojure-java.classpath | 1 +
 debian/rules                     | 2 +-
 debian/scripts/clojure           | 4 +---
 debian/scripts/clojurec          | 4 +---
 7 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6cdfb7..03c9fb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 clojure (1.9.0-2) UNRELEASED; urgency=medium
 
   * Add missing libclojure-java dependencies.
+  * Actually use javahelper to set classpath.
 
  -- Elana Hashman <ehashman at debian.org>  Tue, 27 Feb 2018 17:31:02 -0500
 
diff --git a/debian/clojure.classpath b/debian/clojure.classpath
deleted file mode 100644
index 1b6265f..0000000
--- a/debian/clojure.classpath
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/clojure.jar /usr/share/maven-repo/org/clojure/spec.alpha/debian/spec.alpha-debian.jar /usr/share/maven-repo/org/clojure/core.specs.alpha/debian/core.specs.alpha-debian.jar
diff --git a/debian/control b/debian/control
index 020841f..2ce4d78 100644
--- a/debian/control
+++ b/debian/control
@@ -46,8 +46,7 @@ Package: libclojure-java
 Architecture: all
 Depends:
  libjsr166y-java,
- libspec-alpha-clojure,
- libcore-specs-alpha-clojure,
+ ${java:Depends},
  ${misc:Depends}
 Breaks: clojure (<< 1.9), libclojure1.8-java
 Replaces: clojure (<< 1.9), libclojure1.8-java
diff --git a/debian/libclojure-java.classpath b/debian/libclojure-java.classpath
new file mode 100644
index 0000000..7600431
--- /dev/null
+++ b/debian/libclojure-java.classpath
@@ -0,0 +1 @@
+usr/share/java/clojure-1.9.jar /usr/share/maven-repo/org/clojure/spec.alpha/debian/spec.alpha-debian.jar /usr/share/maven-repo/org/clojure/core.specs.alpha/debian/core.specs.alpha-debian.jar
diff --git a/debian/rules b/debian/rules
index c566119..e2ddac8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ VER := 1.9
 JAVA_HOME = /usr/lib/jvm/default-java
 
 %:
-	dh $@ --with maven-repo-helper
+	dh $@ --with javahelper,maven-repo-helper
 
 override_dh_auto_configure:
 	dh_auto_configure
diff --git a/debian/scripts/clojure b/debian/scripts/clojure
index 87f605c..f84626c 100644
--- a/debian/scripts/clojure
+++ b/debian/scripts/clojure
@@ -6,8 +6,6 @@ else
 	extra_classpath=":$CLASSPATH"
 fi
 
-clojure_classpath="/usr/share/java/clojure- at VER@.jar:/usr/share/maven-repo/org/clojure/spec.alpha/debian/spec.alpha-debian.jar:/usr/share/maven-repo/org/clojure/core.specs.alpha/debian/core.specs.alpha-debian.jar"
-
 while true ; do
 	case "$1" in
 		-cp | -classpath)
@@ -25,4 +23,4 @@ if [ "x$1" = "x" -a "x`which rlwrap`" != "x" ] ; then
 	rlwrap="rlwrap -r -c -C clojure -f /etc/rlwrap/clojure at VER@ -b (){}[],^%\$#@\"\";:''|\\"
 fi
 
-exec $rlwrap java -cp "$clojure_classpath""$extra_classpath" clojure.main "$@"
+exec $rlwrap java -cp /usr/share/java/clojure- at VER@.jar"$extra_classpath" clojure.main "$@"
diff --git a/debian/scripts/clojurec b/debian/scripts/clojurec
index 1b2e0cc..35e923e 100644
--- a/debian/scripts/clojurec
+++ b/debian/scripts/clojurec
@@ -14,8 +14,6 @@ else
 	extra_classpath=":$CLASSPATH"
 fi
 
-clojure_classpath="/usr/share/java/clojure- at VER@.jar:/usr/share/maven-repo/org/clojure/spec.alpha/debian/spec.alpha-debian.jar:/usr/share/maven-repo/org/clojure/core.specs.alpha/debian/core.specs.alpha-debian.jar"
-
 while true ; do
 	case "$1" in
 		-d)
@@ -35,4 +33,4 @@ while true ; do
 	esac
 done
 
-exec java -cp "$clojure_classpath":"$dest_dir$extra_classpath" -Dclojure.compile.path="$dest_dir" -Dclojure.compile.warn-on-reflection=$warn_reflect clojure.lang.Compile "$@"
+exec java -cp /usr/share/java/clojure- at VER@.jar:"$dest_dir$extra_classpath" -Dclojure.compile.path="$dest_dir" -Dclojure.compile.warn-on-reflection=$warn_reflect clojure.lang.Compile "$@"

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