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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit e21f23228cedacbc8c8ee68d1352b8e0990bd915
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Feb 12 21:17:18 2010 +0100

    Fix scaladoc script (LP: #521093)

diff --git a/debian/changelog b/debian/changelog
index 572e65e..5ceb656 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scala (2.7.7.dfsg-2) unstable; urgency=low
+
+  * Fix scaladoc script (LP: #521093)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 12 Feb 2010 21:15:06 +0100
+
 scala (2.7.7.dfsg-1) unstable; urgency=low
 
   * New upstream release (Closes: #551454).
diff --git a/debian/command-scripts/scaladoc b/debian/command-scripts/scaladoc
index 318829d..0d16aec 100644
--- a/debian/command-scripts/scaladoc
+++ b/debian/command-scripts/scaladoc
@@ -2,4 +2,4 @@
 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.Main -doc "$@"
+exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M}  -classpath $SCALAC_CLASSPATH scala.tools.nsc.ScalaDoc "$@"

-- 
Scala packaging