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 17266ba31cf997168961fc64689c8569663718b3 Author: Frank S. Thomas <[email protected]> Date: Wed Sep 7 22:41:30 2011 +0200 Use upstream's command scripts (Closes: #631771). --- debian/changelog | 14 ++++--- debian/command-scripts/fsc | 13 ------- debian/command-scripts/scala | 13 ------- debian/command-scripts/scalac | 14 ------- debian/command-scripts/scaladoc | 12 ------ debian/patches/0002-Adapt-tool-unix.tmpl.patch | 52 ++++++++++++++++++++++++++ debian/patches/series | 1 + debian/scala.install | 12 ++++-- 8 files changed, 70 insertions(+), 61 deletions(-) diff --git a/debian/changelog b/debian/changelog index c366415..e1742aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,15 @@ -scala (2.9.1.dfsg-1) UNRELEASED; urgency=low +scala (2.9.1.dfsg-1) unstable; urgency=low [ Frank S. Thomas ] * Let scala suggest scala-doc (Closes: #632820). * Bump standards version to 3.9.2. - * Added myself to Uploaders. - * debian/command-scripts/*: Take the environment variable JAVA_HOME - into account if it is set. + * Add myself to Uploaders. + * Use upstream's command scripts instead of the custom scripts in + debian/command-scripts/. + - These properly restore the terminal settings (Closes: #631771). + - Added debian/patches/0002-Adapt-tool-unix.tmpl.patch to adapt + the template that is used for the scripts to the layout of these + packages. [ Mehdi Dogguy ] * New upstream release (Closes: #639960). @@ -15,7 +19,7 @@ scala (2.9.1.dfsg-1) UNRELEASED; urgency=low - Remove links created to system jquery{,ui}.js files - Remove dependencies of scala-doc on libjs-jquery{,ui}. - -- Mehdi Dogguy <[email protected]> Thu, 01 Sep 2011 13:33:03 +0200 + -- Frank S. Thomas <[email protected]> Wed, 07 Sep 2011 22:41:07 +0200 scala (2.9.0.1.dfsg-1) unstable; urgency=low diff --git a/debian/command-scripts/fsc b/debian/command-scripts/fsc deleted file mode 100644 index cb488b2..0000000 --- a/debian/command-scripts/fsc +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -JAVA_DIR=/usr/share/java -SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar - -if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then - JAVACMD="$JAVA_HOME/bin/java" -fi - -exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \ - -classpath $SCALAC_CLASSPATH \ - -Dscala.boot.class.path=$SCALAC_CLASSPATH \ - scala.tools.nsc.CompileClient "$@" diff --git a/debian/command-scripts/scala b/debian/command-scripts/scala deleted file mode 100644 index decbc81..0000000 --- a/debian/command-scripts/scala +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -JAVA_DIR=/usr/share/java -LIB_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar:$JAVA_DIR/scala/jline.jar - -if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then - JAVACMD="$JAVA_HOME/bin/java" -fi - -exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \ - -Xbootclasspath/a:$LIB_CLASSPATH \ - -classpath .:$CLASSPATH:$LIB_CLASSPATH \ - scala.tools.nsc.MainGenericRunner "$@" diff --git a/debian/command-scripts/scalac b/debian/command-scripts/scalac deleted file mode 100644 index 14bc94f..0000000 --- a/debian/command-scripts/scalac +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -JAVA_DIR=/usr/share/java -SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar - -if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then - JAVACMD="$JAVA_HOME/bin/java" -fi - -exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \ - -Xbootclasspath/a:$SCALAC_CLASSPATH \ - -classpath .:$CLASSPATH:$SCALAC_CLASSPATH \ - -Dscala.boot.class.path=$SCALAC_CLASSPATH \ - scala.tools.nsc.Main "$@" diff --git a/debian/command-scripts/scaladoc b/debian/command-scripts/scaladoc deleted file mode 100644 index eb5f8d6..0000000 --- a/debian/command-scripts/scaladoc +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -JAVA_DIR=/usr/share/java -SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar - -if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then - JAVACMD="$JAVA_HOME/bin/java" -fi - -exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \ - -classpath .:$CLASSPATH:$SCALAC_CLASSPATH \ - scala.tools.nsc.ScalaDoc "$@" diff --git a/debian/patches/0002-Adapt-tool-unix.tmpl.patch b/debian/patches/0002-Adapt-tool-unix.tmpl.patch new file mode 100644 index 0000000..f7dc1ee --- /dev/null +++ b/debian/patches/0002-Adapt-tool-unix.tmpl.patch @@ -0,0 +1,52 @@ +Description: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout. +Origin: vendor +Forwarded: not-needed +Author: Frank S. Thomas <[email protected]> + +Index: b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +=================================================================== +--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl ++++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +@@ -48,23 +48,7 @@ + esac + + # Finding the root folder for this Scala distribution +-SOURCE=$0; +-SCRIPT=`basename "$SOURCE"`; +-while [ -h "$SOURCE" ]; do +- SCRIPT=`basename "$SOURCE"`; +- LOOKUP=`ls -ld "$SOURCE"`; +- TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; +- if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then +- SOURCE=${TARGET:-.}; +- else +- SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; +- fi; +-done; +- +-# see #2092 +-SCALA_HOME=`dirname "$SOURCE"` +-SCALA_HOME=`cd "$SCALA_HOME"; pwd -P` +-SCALA_HOME=`cd "$SCALA_HOME"/..; pwd` ++SCALA_HOME="/usr/share/java" + + # Remove spaces from SCALA_HOME on windows + if $cygwin; then +@@ -73,16 +57,7 @@ + fi + + # Constructing the extension classpath +-TOOL_CLASSPATH="@classpath@" +-if [ -z "$TOOL_CLASSPATH" ] ; then +- for ext in "$SCALA_HOME"/lib/* ; do +- if [ -z "$TOOL_CLASSPATH" ] ; then +- TOOL_CLASSPATH="$ext" +- else +- TOOL_CLASSPATH="$TOOL_CLASSPATH:$ext" +- fi +- done +-fi ++TOOL_CLASSPATH="$SCALA_HOME/scala-compiler.jar:$SCALA_HOME/scala-library.jar:$SCALA_HOME/scalap.jar:$SCALA_HOME/scala/jline.jar" + + CYGWIN_JLINE_TERMINAL= + if $cygwin; then diff --git a/debian/patches/series b/debian/patches/series index 1ac3d62..26d86fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Use-system-ant-contrib.jar.patch +0002-Adapt-tool-unix.tmpl.patch diff --git a/debian/scala.install b/debian/scala.install index 13a182a..fe90e3c 100644 --- a/debian/scala.install +++ b/debian/scala.install @@ -1,4 +1,8 @@ -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/ +dists/latest/bin/fsc usr/bin/ +dists/latest/bin/scala usr/bin/ +dists/latest/bin/scalac usr/bin/ +dists/latest/bin/scaladoc usr/bin/ +dists/latest/bin/scalap 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
