[Pkg-scala-commits] [SCM] Scala packaging branch, master, updated. debian/2.7.3-1-6-gbdd6e4b

[Mehdi (none)]

The following commit has been merged in the master branch:
commit 24a195c409baf61b11b4ddbd9f6bc10e39f489a5
Author: Mehdi <mehdi at apocalypso.(none)>
Date:   Tue Jan 27 21:35:22 2009 +0100

    Listing a real package as an alternative for the virtual package java-virtual-machine

diff --git a/debian/changelog b/debian/changelog
index 8238032..e0b4342 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ scala (2.7.3-2) UNRELEASED; urgency=low
 
   * Add Homepage field in debian/control
   * Fix debian/rules to execute binary-arch target.
+  * Scala and Scala-library depend now on openjdk6-jre as an alternative
+    to the virtual package java-virtual-machine, thanks Lintian.
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Mon, 26 Jan 2009 18:48:27 +0100
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Tue, 27 Jan 2009 11:20:34 +0100
 
 scala (2.7.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6c0dabf..dd1daa8 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: amd64 i386 ia64 mips mipsel powerpc s390 sparc
-Depends: scala-library, java-gcj-compat, java-virtual-machine
+Depends: scala-library, java-gcj-compat, openjdk-6-jre | java-virtual-machine
 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: amd64 i386 ia64 mips mipsel powerpc s390 sparc
-Depends: java-gcj-compat, java-virtual-machine
+Depends: java-gcj-compat, openjdk-6-jre | java-virtual-machine
 Description: The Scala standard library
  This run-time library is needed to run Scala programs.
 

-- 
Scala packaging