This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository java-wrappers.
commit 171383f950ec92c246db225954f7e3911f828d30 Author: Tony Mancill <tmanc...@debian.org> Date: Mon Apr 7 05:18:37 2014 +0000 patch for #743248 - support Oracle Java 7 paths from java-package --- debian/changelog | 8 ++++++++ jvm-list.sh | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ada58db..c400e2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +java-wrappers (0.1.28) UNRELEASED; urgency=medium + + * Team upload. + * Add support for detecting Oracle JRE/JDK 7 (when installed from a + java-package .deb). (Closes: #743248) + + -- tony mancill <tmanc...@debian.org> Sun, 06 Apr 2014 22:03:40 -0700 + java-wrappers (0.1.27) unstable; urgency=low * Prefer openJDK7 as the "java6" runtime (closes: #714748) diff --git a/jvm-list.sh b/jvm-list.sh index 70f51da..8c97a3e 100644 --- a/jvm-list.sh +++ b/jvm-list.sh @@ -30,6 +30,9 @@ __jvm_default="/usr/lib/jvm/default-java" # Sun runtimes __jvm_sun6="/usr/lib/jvm/java-6-sun /usr/lib/j2*1.6-sun" +# Oracle runtimes +__jvm_oracle7="/usr/lib/jvm/jdk-7-oracle-* /usr/lib/jvm/jre-7-oracle-*" + # all sun runtimes __jvm_sun="$__jvm_sun6" # Sun version at least 5: @@ -47,7 +50,7 @@ __jvm_gcj="$__jvm_gcj2" __jvm_openjdk="$__jvm_openjdk7 $__jvm_openjdk6" # The java* runtimes: -__jvm_java7="$__jvm_openjdk7" +__jvm_java7="$__jvm_openjdk7 $__jvm_oracle7" # -> corresponds to Provides: java6-runtime __jvm_java6="$__jvm_java7 $__jvm_openjdk6 $__jvm_sun6" # -> corresponds to Provides: java5-runtime -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-wrappers.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits