[jlm] 02/06: depend, and force usage of openjdk7

[Martin Quinson]

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

mquinson pushed a commit to branch debian-debian
in repository jlm.

commit 59591c0aedd016c82720f9ead61ce8aefa096d68
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Sun Sep 8 20:54:22 2013 +0200

    depend, and force usage of openjdk7
---
 debian/changelog |    4 ++--
 debian/control   |    2 +-
 debian/plm.sh    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9f2cc5..881c433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 plm (2.2+repack-2) unstable; urgency=low
 
-  * Don't hardcode java6 to not block the ongoing migration to java7
-    (Closes: #722149)
+  * Depend on openjdk7 as openjdk6 will soon be removed (Closes: #722149)
+  * Correctly specify that we need openjdk7 to the java wappers
 
  -- Martin Quinson <mquinson at debian.org>  Sun, 08 Sep 2013 16:17:29 +0200
 
diff --git a/debian/control b/debian/control
index 7d16179..d0a4bd2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Martin Quinson <mquinson at debian.org>
 Build-Depends: debhelper (>> 8), javahelper (>= 0.32), ant, quilt
-Build-Depends-Indep: default-jdk, libmiglayout-java, libjsyntaxpane-java,
+Build-Depends-Indep: openjdk-7-jdk, libmiglayout-java, libjsyntaxpane-java,
   junit4, libgettext-commons-java, libjson-simple-java, libhttpclient-java,
   jython 
 #, scala
diff --git a/debian/plm.sh b/debian/plm.sh
index 45138ec..712d2d9 100755
--- a/debian/plm.sh
+++ b/debian/plm.sh
@@ -6,7 +6,7 @@
 # Jython compiles java bytecode into python bytecode in advance; it needs a user-writable directory to cache it
 export JYTHON_OPTS="${JYTHON_OPTS} -Dpython.cachedir=${HOME}/.jython_cachedir"
 
-find_java_runtime
+find_java_runtime openjdk7
 
 find_jars /usr/share/java/plm.jar
 

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