source: jclic/trunk/fuentes/debian/patches/ReduceElJclic.patch @ 116

Last change on this file since 116 was 116, checked in by jrpelegrina, 5 years ago

First release to xenial

File size: 4.8 KB
  • jclic-0.2.1.0

    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>
    
    old new  
    44# code for java detection based on tuxguitar code
    55# but adding detection of alternatives for jclic
    66
    7 if [ -z $JAVA_HOME ] ; then
    8 
    9         ALTERNATIVE=`ls -l /etc/alternatives/java|grep sun`
    10         if [ -z "$ALTERNATIVE" ]; then
    11                 ALTERNATIVE=`ls -l /etc/alternatives/java|grep openjdk`
    12         fi
    13        
    14         if [ -z "$ALTERNATIVE" ]; then
    15                 t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
    16                 t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
    17                 t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t
    18                 JAVA=${JAVA_HOME}/jre/bin/java
    19         fi
    20 fi
    21 
    22 REMOTE_DISPLAY=$(echo $DISPLAY| awk -F ":" '{print $1}')
    23 if [ "${REMOTE_DISPLAY}" != "" ]; then
    24   if [ -x /usr/bin/padsp ]; then
    25      padsp -s "$REMOTE_DISPLAY" -n JClic -m JClic-stream $aux -cp $CLASSPATH -jar /usr/share/java/jclic.jar "$@" &>/dev/null
    26      exit 0
    27   fi
    28 fi
    297
    308export JAVA=${JAVA:=java}
    319
    32 PULSE_AUDIO=""
    33 if [ -d /tmp/${USER}-pulse/ ]; then
    34         PULSE_AUDIO="padsp"
     10JAVA=$JAVA
     11if [ -d "/usr/lib/jvm/java-7-oracle" ]; then
     12        JAVA_HOME="/usr/lib/jvm/java-7-oracle"
     13        JAVA=${JAVA_HOME}/jre/bin/java
    3514fi
    3615
    37 exec $PULSE_AUDIO $JAVA -jar /usr/share/java/jclic.jar "$@" &>/dev/null
     16exec $JAVA -jar /usr/share/java/jclic.jar "$@" &>/dev/null
    3817
  • jclicreports

    old new fi 
    1111if [ -z $JAVA_HOME ] ; then
    1212
    1313        ALTERNATIVE=`ls -l /etc/alternatives/java | grep sun`
     14
     15        if [ -z "$ALTERNATIVE" ]; then
     16                ALTERNATIVE=`ls -l /etc/alternatives/java|grep oracle`
     17        fi
     18       
    1419        if [ -z "$ALTERNATIVE" ]; then
    1520                ALTERNATIVE=`ls -l /etc/alternatives/java|grep openjdk`
    1621        fi
    1722       
    1823        if [ -z "$ALTERNATIVE" ]; then
    19                 t=/usr/lib/jvm/java-5-sun && test -d $t && JAVA_HOME=$t
     24                t=/usr/lib/jvm/java-5-sun && test -d $t && JAVA_HOME=$t
    2025                t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
    2126                t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t
    22                 t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t
     27                        t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t
    2328                JAVA=${JAVA_HOME}/jre/bin/java
    2429        fi
    2530fi
  • jclic-0.2.1.0

    old new  
    55
    66if [ -z $JAVA_HOME ] ; then
    77
    8         ALTERNATIVE=`ls -l /etc/alternatives/java|grep sun`
     8        ALTERNATIVE=`ls -l /etc/alternatives/java | grep sun`
     9
     10        if [ -z "$ALTERNATIVE" ]; then
     11                ALTERNATIVE=`ls -l /etc/alternatives/java|grep oracle`
     12        fi
     13       
    914        if [ -z "$ALTERNATIVE" ]; then
    1015                ALTERNATIVE=`ls -l /etc/alternatives/java|grep openjdk`
    1116        fi
    1217       
    1318        if [ -z "$ALTERNATIVE" ]; then
    14                 t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
     19                t=/usr/lib/jvm/java-5-sun && test -d $t && JAVA_HOME=$t
    1520                t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
    1621                t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t
     22                        t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t
    1723                JAVA=${JAVA_HOME}/jre/bin/java
    1824        fi
    1925fi
  • src/report/jclicReports.properties

    old new dbServer=jdbc:mysql://127.0.0.1/JClicRep 
    3838# ---Lliurex 02.05.2013 ---
    3939dbLogin=jclic_user
    4040dbPassword=jclic_pwd
     41# If password changed remember to update it in jclic.sgbd template
    4142# ---Lliurex 02.05.2013 ---
    4243
    4344#--------------------------------------------------------------------------
  • jclic.install-files/etc/lliurex-sgbd/jclic.sgbd

    old new  
    2828[parameters]
    2929DB_NAME         = JClicReports
    3030DB_USER         = jclic_user
     31DB_PASS         = jclic_pwd
    3132MYSQL_DATA_FILE =
    3233INCLUDE_PATH    = /etc/jclic/
    3334BACKUP_PATH     = /etc/jclic/backup/
Note: See TracBrowser for help on using the repository browser.