[Pkg-scala-commits] [SCM] Scala packaging branch, master, updated. debian/2.9.1.dfsg-3-1-g1cf398f

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 1cf398f1fd77844fbe0378d6765dc62996763e9e
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jan 4 11:47:16 2012 +0100

    Add jansi.jar to Scala's TOOL_CLASSPATH.

diff --git a/debian/changelog b/debian/changelog
index 26d3e08..4053425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 scala (2.9.1.dfsg-3) unstable; urgency=low
 
   * Do not link to scala-library.jar in scala package (Closes: #654549).
+  * Add jansi.jar to Scala's TOOL_CLASSPATH.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 04 Jan 2012 11:10:22 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 04 Jan 2012 11:46:39 +0100
 
 scala (2.9.1.dfsg-2) unstable; urgency=low
 
diff --git a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
index d1c9247..e73fc93 100644
--- a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
+++ b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
@@ -7,7 +7,7 @@ Subject: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout
  1 files changed, 2 insertions(+), 27 deletions(-)
 
 diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
-index a3dc582..2e150b3 100644
+index a3dc582..c9a9c7b 100644
 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
 +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
 @@ -48,23 +48,7 @@ case "`uname`" in
@@ -49,7 +49,7 @@ index a3dc582..2e150b3 100644
 -        fi
 -    done
 -fi
-+TOOL_CLASSPATH="$SCALA_HOME/scala-compiler.jar:$SCALA_HOME/scala-library.jar:$SCALA_HOME/scalap.jar:$SCALA_HOME/scala/jline.jar"
++TOOL_CLASSPATH="$SCALA_HOME/scala-compiler.jar:$SCALA_HOME/scala-library.jar:$SCALA_HOME/scalap.jar:$SCALA_HOME/scala/jline.jar:$SCALA_HOME/jansi.jar"
  
  CYGWIN_JLINE_TERMINAL=
  if $cygwin; then

-- 
Scala packaging