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 dcb581d0019c0800ad657f5883fc0b138e78b894 Author: Mehdi Dogguy <[email protected]> Date: Fri Jun 24 14:19:22 2011 +0200 Use Scala's provided JLine 2, instead of libjline-java. --- debian/changelog | 3 ++- debian/command-scripts/scala | 2 +- debian/control | 1 - debian/scala.dirs | 1 + debian/scala.install | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2fa4cea..733357f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ scala (2.9.0.1.dfsg-1) unstable; urgency=low [ Mehdi Dogguy ] * New upstream release (Closes: #631429) (LP: #782013). * Refresh patch. + * Use Scala's provided JLine 2, instead of libjline-java. [ Frank S. Thomas ] * Updated debian/copyright for Scala 2.9.0.1. @@ -10,7 +11,7 @@ scala (2.9.0.1.dfsg-1) unstable; urgency=low * Fix spelling error in changelog. * Remove copyright information about docs/android-examples. - -- Mehdi Dogguy <[email protected]> Thu, 23 Jun 2011 23:12:48 +0200 + -- Mehdi Dogguy <[email protected]> Fri, 24 Jun 2011 14:18:37 +0200 scala (2.8.1.dfsg-1) unstable; urgency=low diff --git a/debian/command-scripts/scala b/debian/command-scripts/scala index cf58687..cfa4407 100644 --- a/debian/command-scripts/scala +++ b/debian/command-scripts/scala @@ -1,7 +1,7 @@ #!/bin/sh JAVA_DIR=/usr/share/java -LIB_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar:$JAVA_DIR/jline.jar +LIB_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar:$JAVA_DIR/scala/jline.jar exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \ -Xbootclasspath/a:$LIB_CLASSPATH \ diff --git a/debian/control b/debian/control index 3a2e271..82b929e 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,6 @@ Architecture: all Depends: scala-library (= ${source:Version}), openjdk-6-jre | java6-runtime, - libjline-java, ${misc:Depends} Description: The Scala programming language Scala is a Java-compatible programming language with many diff --git a/debian/scala.dirs b/debian/scala.dirs index e4bc73a..77989b7 100644 --- a/debian/scala.dirs +++ b/debian/scala.dirs @@ -1,2 +1,3 @@ usr/bin usr/share/java +usr/share/java/scala diff --git a/debian/scala.install b/debian/scala.install index d87a6f6..13a182a 100644 --- a/debian/scala.install +++ b/debian/scala.install @@ -1,3 +1,4 @@ debian/command-scripts/* usr/bin/ dists/latest/lib/scala-compiler.jar usr/share/java/ dists/latest/lib/scalap.jar usr/share/java/ +lib/jline.jar usr/share/java/scala/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
