This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mkgmap.
commit 46b48ea7d2da87c2293f99e65225bb377c1bc342 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Nov 1 13:59:24 2015 +0100 Add support for OpenJDK 8 in mkgmap wrapper script. --- debian/changelog | 6 ++++++ debian/install | 1 - debian/mkgmap.sh | 40 ++++++++++++++++++++++++++++++++++++++++ debian/rules | 5 +++++ debian/scripts/mkgmap | 25 ------------------------- 5 files changed, 51 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ec7653..2b8b072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mkgmap (0.0.0+svn3649-2) UNRELEASED; urgency=medium + + * Add support for OpenJDK 8 in mkgmap wrapper script. + + -- Bas Couwenberg <sebas...@debian.org> Sun, 01 Nov 2015 13:58:32 +0100 + mkgmap (0.0.0+svn3649-1) unstable; urgency=medium * New upstream SVN snapshot. diff --git a/debian/install b/debian/install index 75de0b1..57b03f5 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1 @@ dist/mkgmap.jar usr/share/mkgmap/ -debian/scripts/mkgmap usr/bin/ diff --git a/debian/mkgmap.sh b/debian/mkgmap.sh new file mode 100644 index 0000000..9089650 --- /dev/null +++ b/debian/mkgmap.sh @@ -0,0 +1,40 @@ +#! /bin/sh +# Simple wrapper script to execute mkgmap in Debian +set -e + +# Override to a specific one using $JAVACMD +ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`" + +# Let's get the current architecture -- needed for multiarchified Java +ARCH="`dpkg --print-architecture`" + +JAVA_CMDS="$JAVA_HOME/bin/java" +JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java" +JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java" +JAVA_CMDS="${JAVA_CMDS} /usr/bin/java" + +if [ -z "${JAVACMD}" ]; then + for jcmd in $JAVA_CMDS; do + if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + break + fi + done +fi + +if [ -z "${JAVACMD}" ]; then + for jcmd in $JAVA_CMDS; do + if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + break + fi + done +fi + +if [ "$JAVACMD" ]; then + echo "Using $JAVACMD to execute mkgmap." + exec $JAVACMD -jar /usr/share/mkgmap/mkgmap.jar "$@" +else + echo "No valid JVM found to run mkgmap." + exit 1 +fi diff --git a/debian/rules b/debian/rules index 3723e23..52e6104 100755 --- a/debian/rules +++ b/debian/rules @@ -12,3 +12,8 @@ JAVA_HOME=/usr/lib/jvm/default-java override_dh_auto_build: ant +override_dh_auto_install: + dh_auto_install + + install -m 755 debian/mkgmap.sh debian/mkgmap/usr/bin/mkgmap + diff --git a/debian/scripts/mkgmap b/debian/scripts/mkgmap deleted file mode 100644 index d1c162e..0000000 --- a/debian/scripts/mkgmap +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh -# Simple wrapper script to execute mkgmap in Debian -set -e - -ARCH="`dpkg --print-architecture`" - -# First, the users preference as defined by $JAVA_HOME. Next, the -# other JVMs known to work with mkgmap, with the one working best -# fist, and the less functional onces after that. Last, use /usr/bin/java. -# Override to a specific one using JAVACMD -JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/bin/java" - -for jcmd in $JAVA_CMDS; do - if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then - JAVACMD="$jcmd" - fi -done - -if [ "$JAVACMD" ]; then - echo "Using $JAVACMD to execute mkgmap." - exec $JAVACMD -jar /usr/share/mkgmap/mkgmap.jar "$@" -else - echo "No valid JVM found to run mkgmap." - exit 1 -fi -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel