[scala-2.10] 51/166: Also fix scaladoc script

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository scala-2.10.

commit 2a02f0e881801de23226677a945c8f1f73c5680d
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Mar 23 13:18:18 2010 +0100

    Also fix scaladoc script
---
 debian/changelog                | 6 ++++++
 debian/command-scripts/scaladoc | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d984148..b3dea45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scala (2.7.7.dfsg-4) unstable; urgency=low
+
+  * Fix scaladoc script to use $CLASSPATH variable
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 23 Mar 2010 13:20:41 +0100
+
 scala (2.7.7.dfsg-3) unstable; urgency=low
 
   * Fix scalac script (use $CLASSPATH variable), (LP: #544481)
diff --git a/debian/command-scripts/scaladoc b/debian/command-scripts/scaladoc
index 0d16aec..084747d 100644
--- a/debian/command-scripts/scaladoc
+++ b/debian/command-scripts/scaladoc
@@ -2,4 +2,5 @@
 JAVA_DIR=/usr/share/java
 SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar
 
-exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M}  -classpath $SCALAC_CLASSPATH scala.tools.nsc.ScalaDoc "$@"
+exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \
+	 -classpath .:$CLASSPATH:$SCALAC_CLASSPATH scala.tools.nsc.ScalaDoc "$@"

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