Description: <short summary of the patch>
 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+lliurex20) precise; urgency=high
 .
   * Fixed mysql initialization in zmd
   * Updated java to use openjdk-7
   * Remove thinclient options
   * Added traslations
Author: Jaime Munyoz Fayos <munyoz_jaifay@gva.es>

---
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: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- jclic-0.2.1.0.orig/jclic
+++ jclic-0.2.1.0/jclic
@@ -4,35 +4,14 @@
 # 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`
-	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-6-sun && test -d $t && JAVA_HOME=$t
-	        t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t
-        	JAVA=${JAVA_HOME}/jre/bin/java
-	fi
-fi
-
-REMOTE_DISPLAY=$(echo $DISPLAY| awk -F ":" '{print $1}')
-if [ "${REMOTE_DISPLAY}" != "" ]; then
-  if [ -x /usr/bin/padsp ]; then
-     padsp -s "$REMOTE_DISPLAY" -n JClic -m JClic-stream $aux -cp $CLASSPATH -jar /usr/share/java/jclic.jar "$@" &>/dev/null 
-     exit 0
-  fi
-fi
 
 export JAVA=${JAVA:=java}
 
-PULSE_AUDIO=""
-if [ -d /tmp/${USER}-pulse/ ]; then
-	PULSE_AUDIO="padsp"
+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
 
-exec $PULSE_AUDIO $JAVA -jar /usr/share/java/jclic.jar "$@" &>/dev/null
+exec $JAVA -jar /usr/share/java/jclic.jar "$@" &>/dev/null
 
--- 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/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/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/