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

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

First release to xenial

File size: 3.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+lliurex12) precise; urgency=low
     .
       * Changed ALTERNATIVE java discover
       * Added jclic user password in jclic.sgbd file
    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  
    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
  • jclic-0.2.1.0

    old new if [ -z $JAVA_HOME ] ; then 
    2424                        t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t
    2525                JAVA=${JAVA_HOME}/jre/bin/java
    2626        fi
     27       
    2728fi
    2829
    2930REMOTE_DISPLAY=$(echo $DISPLAY| awk -F ":" '{print $1}')
  • 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
  • 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.