The following commit has been merged in the master branch: commit 316fdaac1a2ee6f9fbfce03017aec214c1601de7 Author: David Paleino <da...@debian.org> Date: Fri Mar 2 21:32:38 2012 +0100
Fix wrapper script to detect newer versions of OpenJDK (Closes: #661942) diff --git a/debian/changelog b/debian/changelog index 3db2f29..8ec4b45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +josm (0.0.svn4878+dfsg1-2) UNRELEASED; urgency=low + + * Fix wrapper script to detect newer versions of OpenJDK + (Closes: #661942) + + -- David Paleino <da...@debian.org> Fri, 02 Mar 2012 21:32:01 +0100 + josm (0.0.svn4878+dfsg1-1) unstable; urgency=low * New tested snapshot diff --git a/debian/josm.sh b/debian/josm.sh index 575a14d..f6bd3f8 100644 --- a/debian/josm.sh +++ b/debian/josm.sh @@ -9,8 +9,8 @@ ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`" # Let's get the current architecture -- needed for multiarchified Java ARCH="`dpkg --print-architecture`" -# If OpenJDK 6 is only available headless, do not try it -if dpkg --get-selections openjdk-6-jre | grep install$ > /dev/null ; then +# If OpenJDK is only available headless, do not try it +if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-sun/bin/java " else JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/bin/java" -- Editor for OpenStreetMap _______________________________________________ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits