[scala-2.10] 157/166: Install the files under /usr/share/scala-2.10

[Emmanuel Bourg]

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 06caaf0e3c1967c81f5d7db0b92be51347e7271b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 18 23:14:19 2015 +0200

    Install the files under /usr/share/scala-2.10
---
 ..._HOME-and-TOOL_CLASSPATH-to-the-package-l.patch | 54 ----------------------
 debian/patches/series                              |  2 +-
 debian/scala-2.10.install                          | 12 ++---
 debian/scala-2.10.links                            |  6 +++
 4 files changed, 13 insertions(+), 61 deletions(-)

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 ea84b6f..0000000
--- a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: "Frank S. Thomas" <fst at debian.org>
-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
-@@ -84,16 +74,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}${SEP}${ext}"
--        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 ed047af..da9f20b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
 remove-non-ascii-ftbfs.patch
 0001-Define-system-locations.patch
 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
 0005-java7-compilation.patch
 0006-ignore-pax-exam-dependencies.patch
 0007-ignore-partest.patch
diff --git a/debian/scala-2.10.install b/debian/scala-2.10.install
index 11e1386..0409e8d 100644
--- a/debian/scala-2.10.install
+++ b/debian/scala-2.10.install
@@ -1,6 +1,6 @@
-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/
-lib/jline.jar                       usr/share/java/scala/
+build/pack/bin/fsc                usr/share/scala-2.10/bin/
+build/pack/bin/scala              usr/share/scala-2.10/bin/
+build/pack/bin/scalac             usr/share/scala-2.10/bin/
+build/pack/bin/scaladoc           usr/share/scala-2.10/bin/
+build/pack/bin/scalap             usr/share/scala-2.10/bin/
+lib/jline.jar                     usr/share/scala-2.10/lib/
diff --git a/debian/scala-2.10.links b/debian/scala-2.10.links
new file mode 100644
index 0000000..cfddbc7
--- /dev/null
+++ b/debian/scala-2.10.links
@@ -0,0 +1,6 @@
+usr/share/java/scala-actors-2.10.jar                   usr/share/scala-2.10/lib/scala-actors.jar
+usr/share/java/scala-compiler-2.10.jar                 usr/share/scala-2.10/lib/scala-compiler.jar
+usr/share/java/scala-library-2.10.jar                  usr/share/scala-2.10/lib/scala-library.jar
+usr/share/java/scala-reflect-2.10.jar                  usr/share/scala-2.10/lib/scala-reflect.jar
+usr/share/java/scala-swing-2.10.jar                    usr/share/scala-2.10/lib/scala-swing.jar
+usr/share/java/scalap-2.10.jar                         usr/share/scala-2.10/lib/scalap.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git