[Pkg-scala-commits] [SCM] Scala packaging branch, master, updated. debian/2.7.7.dfsg-2-2-g8a0d34d

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 8a0d34d3bcb9be0a5499a41a175663618dbfe46b
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Mar 23 12:55:25 2010 +0100

    Adjust the JRE/JVM depends (Closes: ##573384)

diff --git a/debian/changelog b/debian/changelog
index 8aa6794..d984148 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 scala (2.7.7.dfsg-3) unstable; urgency=low
 
   * Fix scalac script (use $CLASSPATH variable), (LP: #544481)
+  * Adjust the JRE/JVM depends (Closes: #573384)
 
- -- Mehdi Dogguy <mehdi at debian.org>  Tue, 23 Mar 2010 12:51:16 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 23 Mar 2010 12:53:15 +0100
 
 scala (2.7.7.dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 67719e8..f614ae3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Git: git://git.debian.org/git/pkg-scala/packages/scala.git
 
 Package: scala
 Architecture: all
-Depends: scala-library (= ${source:Version}), openjdk-6-jre | java-virtual-machine, ${misc:Depends}
+Depends: scala-library (= ${source:Version}), openjdk-6-jre | java6-runtime, ${misc:Depends}
 Description: The Scala programming language
  Scala is a Java-compatible programming language with many
  modern language features.  It is Java-compatible in that
@@ -29,7 +29,7 @@ Description: The Scala programming language
 
 Package: scala-library
 Architecture: all
-Depends: openjdk-6-jre | java-virtual-machine, ${misc:Depends}
+Depends: openjdk-6-jre | java6-runtime, ${misc:Depends}
 Description: The Scala standard library
  This run-time library is needed to run Scala programs.
 

-- 
Scala packaging