[scala] 08/22: Require a Java 7+ runtime

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/2.11.6-1
in repository scala.

commit f277f4b06f74784494cb3092215a5d30cde29f06
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 12 15:44:27 2015 +0200

    Require a Java 7+ runtime
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4aaf9b6..1816a82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ scala (2.11.6-2) UNRELEASED; urgency=medium
     - Removed 0001-Define-system-locations.patch (obsolete)
     - Removed 0005-java7-compilation.patch (fixed upstream)
     - Depend on libjline2-java instead of building an embedded copy of jline
+    - Require a Java 7+ runtime
   * Removed the JRE dependency of scala-library
   * The package has been adopted by the Java Team (Closes: #754935)
   * Adapted debian/orig-tar.sh for Scala 2.11
diff --git a/debian/control b/debian/control
index 8c1287e..5c1c700 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Mehdi Dogguy <mehdi at debian.org>,
  Min Huang <min.huang at alumni.usc.edu>
 Build-Depends:
- default-jdk | java6-sdk,
+ default-jdk,
  ant,
  ant-contrib,
  ant-optional,
@@ -27,7 +27,7 @@ Package: scala
 Architecture: all
 Depends:
  scala-library (= ${source:Version}),
- openjdk-7-jre | java7-runtime | java6-runtime,
+ default-jre-headless (>= 2:1.7) | java7-runtime-headless,
  libjline2-java,
  ${misc:Depends}
 Suggests: scala-doc (>= ${source:Version})

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