This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala.
commit c1cab3b80cec2eb2f350f5e3cb7a8d743a7ee119 Author: Emmanuel Bourg <[email protected]> Date: Thu Jun 18 23:14:19 2015 +0200 Install the files under /usr/share/scala-2.11 --- debian/changelog | 2 + ..._HOME-and-TOOL_CLASSPATH-to-the-package-l.patch | 58 ---------------------- debian/patches/series | 2 +- debian/rules | 3 -- debian/scala.dirs | 3 -- debian/scala.install | 10 ++-- debian/scala.links | 17 ++++++- 7 files changed, 24 insertions(+), 71 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc3b2ec..8b59188 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ scala (2.11.6-2) UNRELEASED; urgency=medium - Depend on libjline2-java instead of building an embedded copy of jline - Require a Java 7+ runtime - Refreshed debian/copyright + * Install the files under /usr/share/scala-2.11 and follow the layout + of the upstream distribution * Removed the JRE dependency of scala-library * Build depend on scala (>= 2.11) * Install the Maven artifacts for scala-actors and scala-reflect 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 deleted file mode 100644 index dc9db47..0000000 --- a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: "Frank S. Thomas" <[email protected]> -Date: Wed, 7 Sep 2011 20:41:30 +0000 -Subject: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout - ---- - .../scala/tools/ant/templates/tool-unix.tmpl | 29 +------------------ - 1 files changed, 2 insertions(+), 27 deletions(-) - ---- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl -+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl -@@ -8,16 +8,6 @@ - # PARTICULAR PURPOSE. - ############################################################################## - --findScalaHome () { -- # see SI-2092 and SI-5792 -- local source="${BASH_SOURCE[0]}" -- while [ -h "$source" ] ; do -- local linked="$(readlink "$source")" -- local dir="$( cd -P $(dirname "$source") && cd -P $(dirname "$linked") && pwd )" -- source="$dir/$(basename "$linked")" -- done -- ( cd -P "$(dirname "$source")/.." && pwd ) --} - execCommand () { - [[ -n $SCALA_RUNNER_DEBUG ]] && echo "" && for arg in "$@@"; do echo "$arg"; done && echo ""; - "$@@" -@@ -68,7 +58,7 @@ - fi - - # Finding the root folder for this Scala distribution --SCALA_HOME="$(findScalaHome)" -+SCALA_HOME="/usr/share/java" - SEP=":" - - # Possible additional command line options -@@ -83,20 +73,7 @@ - fi - - # Constructing the extension classpath --TOOL_CLASSPATH="@classpath@" --if [[ -z "$TOOL_CLASSPATH" ]]; then -- for ext in "$SCALA_HOME"/lib/* ; do -- file_extension="${ext##*.}" -- # SI-8967 Only consider directories and files named '*.jar' -- if [[ -d "$ext" || $file_extension == "jar" ]]; then -- if [[ -z "$TOOL_CLASSPATH" ]]; then -- TOOL_CLASSPATH="$ext" -- else -- TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}" -- fi -- fi -- done --fi -+TOOL_CLASSPATH="$SCALA_HOME/scala-compiler.jar:$SCALA_HOME/scala-library.jar:$SCALA_HOME/scala-reflect.jar:$SCALA_HOME/scalap.jar:$SCALA_HOME/scala/jline.jar:$SCALA_HOME/jansi.jar" - - if [[ -n "$cygwin" ]]; then - if [[ "$OS" = "Windows_NT" ]] && cygpath -m .>/dev/null 2>/dev/null ; then diff --git a/debian/patches/series b/debian/patches/series index cbeb5e5..42aa665 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 0002-Use-system-ant-contrib.jar.patch -0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch +#0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch 0006-ignore-test-dependencies.patch 0008-disable-lib-fetching.patch diff --git a/debian/rules b/debian/rules index ff84715..0166b38 100755 --- a/debian/rules +++ b/debian/rules @@ -30,9 +30,6 @@ override_dh_auto_clean: override_dh_compress: dh_compress -X.js -X.scala - # dh_compress is executed after mh_installpoms and mh_linkjars - # ugly hack to fix #654549 - find debian/scala \( -type f -or -type l \) -name "scala-library*.jar" -delete get-orig-source: uscan --download-current-version --rename diff --git a/debian/scala.dirs b/debian/scala.dirs deleted file mode 100644 index 77989b7..0000000 --- a/debian/scala.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/java -usr/share/java/scala diff --git a/debian/scala.install b/debian/scala.install index a7dd04c..60509d7 100644 --- a/debian/scala.install +++ b/debian/scala.install @@ -1,5 +1,5 @@ -build/pack/bin/fsc usr/bin/ -build/pack/bin/scala usr/bin/ -build/pack/bin/scalac usr/bin/ -build/pack/bin/scaladoc usr/bin/ -build/pack/bin/scalap usr/bin/ +build/pack/bin/fsc usr/share/scala-2.11/bin/ +build/pack/bin/scala usr/share/scala-2.11/bin/ +build/pack/bin/scalac usr/share/scala-2.11/bin/ +build/pack/bin/scaladoc usr/share/scala-2.11/bin/ +build/pack/bin/scalap usr/share/scala-2.11/bin/ diff --git a/debian/scala.links b/debian/scala.links index 88d6f9c..36a1a03 100644 --- a/debian/scala.links +++ b/debian/scala.links @@ -1 +1,16 @@ -usr/share/java/jline2.jar usr/share/java/scala/jline.jar +usr/share/java/hawtjni-runtime.jar usr/share/scala-2.11/lib/hawtjni-runtime.jar +usr/share/java/jansi.jar usr/share/scala-2.11/lib/jansi.jar +usr/share/java/jline2.jar usr/share/scala-2.11/lib/jline.jar +usr/share/java/scala-xml_2.11.jar usr/share/scala-2.11/lib/scala-xml.jar +usr/share/java/scala-parser-combinators_2.11.jar usr/share/scala-2.11/lib/scala-parser-combinators.jar +usr/share/java/scala-actors.jar usr/share/scala-2.11/lib/scala-actors.jar +usr/share/java/scala-compiler.jar usr/share/scala-2.11/lib/scala-compiler.jar +usr/share/java/scala-library.jar usr/share/scala-2.11/lib/scala-library.jar +usr/share/java/scala-reflect.jar usr/share/scala-2.11/lib/scala-reflect.jar +usr/share/java/scalap.jar usr/share/scala-2.11/lib/scalap.jar + +usr/share/scala-2.11/bin/fsc usr/bin/fsc +usr/share/scala-2.11/bin/scala usr/bin/scala +usr/share/scala-2.11/bin/scalac usr/bin/scalac +usr/share/scala-2.11/bin/scaladoc usr/bin/scaladoc +usr/share/scala-2.11/bin/scalap usr/bin/scalap -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
