This is an automated email from the git hooks/post-receive script. mquinson pushed a commit to branch debian-debian in repository jlm.
commit 82da5be670442072fa345889c7092ce8f4c04775 Author: Martin Quinson <[email protected]> Date: Sun Sep 8 16:18:03 2013 +0200 Don't hardcode java6 to not block the ongoing migration to java7 --- debian/changelog | 7 +++++++ debian/control | 8 +++++--- debian/plm.sh | 2 +- debian/rules | 5 +++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 28d4d48..d9f2cc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +plm (2.2+repack-2) unstable; urgency=low + + * Don't hardcode java6 to not block the ongoing migration to java7 + (Closes: #722149) + + -- Martin Quinson <[email protected]> Sun, 08 Sep 2013 16:17:29 +0200 + plm (2.2+repack-1) unstable; urgency=low * New upstream release: diff --git a/debian/control b/debian/control index 432e8b1..7d16179 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,17 @@ Section: java Priority: optional Maintainer: Martin Quinson <[email protected]> Build-Depends: debhelper (>> 8), javahelper (>= 0.32), ant, quilt -Build-Depends-Indep: openjdk-6-jdk, libmiglayout-java, libjsyntaxpane-java, +Build-Depends-Indep: default-jdk, libmiglayout-java, libjsyntaxpane-java, junit4, libgettext-commons-java, libjson-simple-java, libhttpclient-java, - jython, scala + jython +#, scala Standards-Version: 3.9.4 Homepage: http://www.loria.fr/~quinson/Teaching/PLM/ Package: plm Architecture: all -Depends: ${java:Depends}, ${misc:Depends}, openjdk-6-jdk +Depends: ${java:Depends}, ${misc:Depends} +Recommends: ${java:Recommends} Description: Programming exerciser in Java, Python, Scala and others The Programmer's Learning Machine (PLM) is a free cross-platform programming exerciser. It lets you explore various concepts of programming through diff --git a/debian/plm.sh b/debian/plm.sh index 9bd9870..45138ec 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 java6 +find_java_runtime find_jars /usr/share/java/plm.jar diff --git a/debian/rules b/debian/rules index b13c81a..62f222a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,8 @@ ICONS := $(DESTDIR)/usr/share/icons/hicolor export JAVA_HOME=/usr/lib/jvm/default-java depspath= /usr/share/java/miglayout.jar:/usr/share/java/jsyntaxpane.jar:/usr/share/java/gettext-commons.jar:/usr/share/java/junit4.jar -scalapath=/usr/share/java/scala-compiler.jar:/usr/share/java/scala-library.jar +scalapath=. +#scalapath=/usr/share/java/scala-compiler.jar:/usr/share/java/scala-library.jar langpath=/usr/share/java/json_simple.jar:/usr/share/java/jython.jar:. httppath=/usr/share/java/httpclient.jar:/usr/share/java/httpcore.jar export CLASSPATH=$(depspath):$(langpath):$(httppath):$(scalapath):. @@ -41,7 +42,7 @@ override_jh_build: cd debian/_jh_build.plm && jar xf ../../lib/plm-messages.jar org # Finally, ask the scripts to compile our stuff, too - jh_build --javacopts="-source 1.6 -target 1.6" --no-javadoc + jh_build --no-javadoc #--javacopts="-source 1.6 -target 1.6" override_dh_auto_build: ant -f build.xml clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jlm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
