[Pkg-scala-commits] [SCM] Scala packaging branch, master, updated. debian/2.7.7.dfsg-2-2-g8a0d34d

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit e5596503634474917689f05521748f77ac543bcc
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Mar 23 12:53:09 2010 +0100

    Fix scalac script (use $CLASSPATH variable), (LP: #544481)

diff --git a/debian/changelog b/debian/changelog
index 5ceb656..8aa6794 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scala (2.7.7.dfsg-3) unstable; urgency=low
+
+  * Fix scalac script (use $CLASSPATH variable), (LP: #544481)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 23 Mar 2010 12:51:16 +0100
+
 scala (2.7.7.dfsg-2) unstable; urgency=low
 
   * Fix scaladoc script (LP: #521093)
diff --git a/debian/command-scripts/scalac b/debian/command-scripts/scalac
index 89c424a..7cc07ce 100644
--- a/debian/command-scripts/scalac
+++ b/debian/command-scripts/scalac
@@ -4,5 +4,5 @@ SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar
 
 exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \
   -Xbootclasspath/a:$SCALAC_CLASSPATH \
-  -classpath $SCALAC_CLASSPATH -Dscala.boot.class.path=$SCALAC_CLASSPATH \
+  -classpath .:$CLASSPATH:$SCALAC_CLASSPATH -Dscala.boot.class.path=$SCALAC_CLASSPATH \
   scala.tools.nsc.Main "$@"

-- 
Scala packaging