[scala-2.10] 123/166: Update paths of elements to install

[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 c5e4b518b4acd4c8be0658b0e9fc2695ab88b2c7
Author: Lucas Satabin <lucas.satabin at gnieh.org>
Date:   Mon Mar 31 21:35:07 2014 +0200

    Update paths of elements to install
---
 .../0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch  | 2 +-
 debian/scala-doc.install                                             | 5 ++---
 debian/scala-library.jlibs                                           | 5 ++---
 3 files changed, 5 insertions(+), 7 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
index 87601f1..ea84b6f 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
@@ -48,7 +48,7 @@ Subject: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout
 -        fi
 -    done
 -fi
-+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"
++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/scala-doc.install b/debian/scala-doc.install
index 7d323bf..d58f493 100644
--- a/debian/scala-doc.install
+++ b/debian/scala-doc.install
@@ -1,3 +1,2 @@
-dists/latest/doc/scala-devel-docs/api/*		usr/share/doc/scala-doc/html/
-dists/latest/doc/scala-devel-docs/examples/*	usr/share/doc/scala-doc/examples/
-dists/latest/doc/scala-devel-docs/tools/*	usr/share/doc/scala-doc/tools/
+dists/latest/api/*		usr/share/doc/scala-doc/html/
+dists/latest/doc/tools/*	usr/share/doc/scala-doc/tools/
diff --git a/debian/scala-library.jlibs b/debian/scala-library.jlibs
index 0c2f90d..1ff855e 100644
--- a/debian/scala-library.jlibs
+++ b/debian/scala-library.jlibs
@@ -1,6 +1,5 @@
 dists/latest/lib/scala-library.jar
-dists/latest/lib/scala-dbc.jar
+dists/latest/lib/scala-actors.jar
+dists/latest/lib/scala-reflect.jar
 dists/latest/lib/scala-swing.jar
 dists/latest/lib/scala-partest.jar
-dists/latest/lib/scalacheck.jar
-dists/latest/lib/scala-partest.jar

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