Description: TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . jclic (0.2.1.0-1+lliurex22) precise; urgency=high . * Jclic reports * Jclic Author fixed Author: Angel Berlanas Vicente --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- jclic-0.2.1.0.orig/jclicreports +++ jclic-0.2.1.0/jclicreports @@ -8,32 +8,14 @@ if [ ! -e /etc/.jclic.conf ] ; then exit 0 fi -if [ -z $JAVA_HOME ] ; then - - ALTERNATIVE=`ls -l /etc/alternatives/java | grep sun` +export JAVA=${JAVA:=java} - if [ -z "$ALTERNATIVE" ]; then - ALTERNATIVE=`ls -l /etc/alternatives/java|grep oracle` - fi - - if [ -z "$ALTERNATIVE" ]; then - ALTERNATIVE=`ls -l /etc/alternatives/java|grep openjdk` - fi - - if [ -z "$ALTERNATIVE" ]; then - t=/usr/lib/jvm/java-5-sun && test -d $t && JAVA_HOME=$t - t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t - t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t - t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t - JAVA=${JAVA_HOME}/jre/bin/java - fi +JAVA=$JAVA +if [ -d "/usr/lib/jvm/java-7-oracle" ]; then + JAVA_HOME="/usr/lib/jvm/java-7-oracle" + JAVA=${JAVA_HOME}/jre/bin/java fi -USER_LANG=$(echo $LANG|cut -d "_" -f1) - -export JAVA=${JAVA:=java} -export LANG=es_ES.utf8 -exec $JAVA -jar /usr/share/java/jclicreports.jar -language=$USER_LANG "$@" +exec $JAVA -jar /usr/share/java/jclicreports.jar -exit 0 --- jclic-0.2.1.0.orig/jclicauthor +++ jclic-0.2.1.0/jclicauthor @@ -1,30 +1,17 @@ #!/bin/sh -# jclicauthor wrapper script -# code for java detection borrowed from tuxguitar +# jclicplayer wrapper script +# code for java detection based on tuxguitar code +# but adding detection of alternatives for jclic -if [ -z $JAVA_HOME ] ; then - ALTERNATIVE=`ls -l /etc/alternatives/java | grep sun` +export JAVA=${JAVA:=java} - if [ -z "$ALTERNATIVE" ]; then - ALTERNATIVE=`ls -l /etc/alternatives/java|grep oracle` - fi - - if [ -z "$ALTERNATIVE" ]; then - ALTERNATIVE=`ls -l /etc/alternatives/java|grep openjdk` - fi - - if [ -z "$ALTERNATIVE" ]; then - t=/usr/lib/jvm/java-5-sun && test -d $t && JAVA_HOME=$t - t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t - t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t - t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t - JAVA=${JAVA_HOME}/jre/bin/java - fi +JAVA=$JAVA +if [ -d "/usr/lib/jvm/java-7-oracle" ]; then + JAVA_HOME="/usr/lib/jvm/java-7-oracle" + JAVA=${JAVA_HOME}/jre/bin/java fi -export JAVA=${JAVA:=java} - -exec $JAVA -jar /usr/share/java/jclicauthor.jar "$@" +exec $JAVA -jar /usr/share/java/jclicauthor.jar "$@" &>/dev/null