[jruby] 02/04: Switch to use default-jdk >= 1.8 in builds

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository jruby.

commit 539a0684526f47c91a053b0714495511a2f8221e
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Apr 23 15:16:15 2016 +0100

    Switch to use default-jdk >= 1.8 in builds
---
 debian/changelog | 9 +++++++++
 debian/control   | 2 +-
 debian/rules     | 5 +----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86ef339..db1c53c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jruby (1.7.25-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Fix FTBFS due to changes introduced in yecht 1.1 and snakeyaml 1.7.
+    (Closes: #821181).
+  * Build with default-jdk now it has finally switched to Java 8.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 23 Apr 2016 15:03:35 +0100
+
 jruby (1.7.22-2) unstable; urgency=medium
 
   * Build with maven-debian-helper 2.
diff --git a/debian/control b/debian/control
index 0d324b8..7b02d4f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders: Miguel Landaeta <nomadium at debian.org>,
 Build-Depends: ant-optional,
                bnd,
                debhelper (>= 9~),
+               default-jdk (>= 2:1.8~),
                jruby-openssl,
                junit4,
                libasm4-java,
@@ -49,7 +50,6 @@ Build-Depends: ant-optional,
                maven-repo-helper,
                nailgun (>= 0.9.1~),
                netbase,
-               openjdk-8-jdk,
                ruby-minitest,
                ruby-rspec,
                yydebug
diff --git a/debian/rules b/debian/rules
index 4d4ded5..6b2a75a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,7 @@
 
 include /usr/share/dpkg/default.mk
 
-#export JAVA_HOME=/usr/lib/jvm/default-java
-# upstream code directly from git repo builds with openjdk-7-jdk
-# I have to find out how/why or just wait for openjdk-8-jdk to be default
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_BUILD_ARCH)
+export JAVA_HOME=/usr/lib/jvm/default-java
 export LC_ALL=en_US.UTF-8
 
 %:

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