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+lliurex12) precise; urgency=low . * Changed ALTERNATIVE java discover * Added jclic user password in jclic.sgbd file Author: Jaime Munyoz Fayos --- 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/jclicauthor +++ jclic-0.2.1.0/jclicauthor @@ -5,15 +5,21 @@ if [ -z $JAVA_HOME ] ; then - ALTERNATIVE=`ls -l /etc/alternatives/java|grep sun` + ALTERNATIVE=`ls -l /etc/alternatives/java | grep sun` + + 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-1.5.0-sun && test -d $t && JAVA_HOME=$t + 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 fi --- jclic-0.2.1.0.orig/jclic +++ jclic-0.2.1.0/jclic @@ -24,6 +24,7 @@ if [ -z $JAVA_HOME ] ; then t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t JAVA=${JAVA_HOME}/jre/bin/java fi + fi REMOTE_DISPLAY=$(echo $DISPLAY| awk -F ":" '{print $1}') --- jclic-0.2.1.0.orig/jclicreports +++ jclic-0.2.1.0/jclicreports @@ -11,15 +11,20 @@ fi if [ -z $JAVA_HOME ] ; then ALTERNATIVE=`ls -l /etc/alternatives/java | grep sun` + + 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-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 + t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t JAVA=${JAVA_HOME}/jre/bin/java fi fi --- jclic-0.2.1.0.orig/src/report/jclicReports.properties +++ jclic-0.2.1.0/src/report/jclicReports.properties @@ -38,6 +38,7 @@ dbServer=jdbc:mysql://127.0.0.1/JClicRep # ---Lliurex 02.05.2013 --- dbLogin=jclic_user dbPassword=jclic_pwd +# If password changed remember to update it in jclic.sgbd template # ---Lliurex 02.05.2013 --- #-------------------------------------------------------------------------- --- jclic-0.2.1.0.orig/jclic.install-files/etc/lliurex-sgbd/jclic.sgbd +++ jclic-0.2.1.0/jclic.install-files/etc/lliurex-sgbd/jclic.sgbd @@ -28,6 +28,7 @@ [parameters] DB_NAME = JClicReports DB_USER = jclic_user +DB_PASS = jclic_pwd MYSQL_DATA_FILE = INCLUDE_PATH = /etc/jclic/ BACKUP_PATH = /etc/jclic/backup/