Ignore:
Timestamp:
Feb 1, 2017, 10:38:41 AM (4 years ago)
Author:
Juanma
Message:

Updated to 3.2.1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • jclic/trunk/fuentes/debian/patches/jclicreports_lliurex.patch

    r116 r3466  
    1 Description: <short summary of the patch>
    2  TODO: Put a short summary on the line above and replace this paragraph
    3  with a longer explanation of this change. Complete the meta-information
    4  with other relevant fields (see below for details). To make it easier, the
    5  information below has been extracted from the changelog. Adjust it or drop
    6  it.
    7  .
    8  jclic (0.2.1.0-1) unstable; urgency=low
    9  .
    10    * New upstream version
    11    * Fixed bashism in jclic launcher (Closes: #581114)
    12    * Switch to dpkg-source 3.0 (quilt) format
    13    * debian/control: bumped standards version to 3.8.4
    14    * debian/control: added quilt build dependency
    15    * fix detection of PulseAudio and remote DISPLAY, thanks again to
    16      Mario Izquierdo for his hints (Closes: #576465)
    17 Author: José L. Redrejo Rodríguez <jredrejo@debian.org>
    18 Bug-Debian: http://bugs.debian.org/576465
    19 Bug-Debian: http://bugs.debian.org/581114
    20 
    21 ---
    22 The information above should follow the Patch Tagging Guidelines, please
    23 checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
    24 are templates for supplementary fields that you might want to add:
    25 
    26 Origin: <vendor|upstream|other>, <url of original patch>
    27 Bug: <url in upstream bugtracker>
    28 Bug-Debian: http://bugs.debian.org/<bugnumber>
    29 Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
    30 Forwarded: <no|not-needed|url proving that it has been forwarded>
    31 Reviewed-By: <name and email of someone who approved the patch>
    32 Last-Update: <YYYY-MM-DD>
    33 
    34 --- jclic-0.2.1.0.orig/jclicreports
    35 +++ jclic-0.2.1.0/jclicreports
    36 @@ -3,21 +3,32 @@
    37  # jclicreports wrapper script
    38  # code for java detection borrowed from tuxguitar
    39  
     1--- /dev/null
     2+++ b/jclicreports
     3@@ -0,0 +1,27 @@
     4+#!/bin/sh
     5+
     6+# jclicreports wrapper script
     7+# code for java detection borrowed from tuxguitar
     8+
    409+if [ ! -e /etc/.jclic.conf ] ; then
    41 +       zenity --error --text "Per a executar el servidor d’informes heu de configurar-lo.\nAneu a\nAplicacions / Administració de Lliurex / Centre de control de LliureX / Programari / Configuració del servidor d’informes"
    42 +       exit 0
     10+        zenity --error --text "Per a executar el servidor d’informes heu de configurar-lo.\nAneu a\nAplicacions / Administració de Lliurex / Centre de control de LliureX / Programari /      Configuració del servidor d’informes"
     11+        exit 0
    4312+fi
    4413+
    45  if [ -z $JAVA_HOME ] ; then
    46  
    47 -       ALTERNATIVE=`ls -l /etc/alternatives/java|grep sun`
    48 +       ALTERNATIVE=`ls -l /etc/alternatives/java | grep sun`
    49         if [ -z "$ALTERNATIVE" ]; then
    50                 ALTERNATIVE=`ls -l /etc/alternatives/java|grep openjdk`
    51         fi
    52        
    53         if [ -z "$ALTERNATIVE" ]; then
    54 -               t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
    55 +               t=/usr/lib/jvm/java-5-sun && test -d $t && JAVA_HOME=$t
    56                 t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
    57                 t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t
    58 +               t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t
    59                 JAVA=${JAVA_HOME}/jre/bin/java
    60         fi
    61  fi
    62  
     14+export JAVA=${JAVA:=java}
     15+
     16+JAVA=$JAVA                                                                                                                                                                                   
     17+if [ -d "/usr/lib/jvm/java-7-oracle" ]; then
     18+       JAVA_HOME="/usr/lib/jvm/java-7-oracle"
     19+       JAVA=${JAVA_HOME}/jre/bin/java
     20+ fi
     21+
    6322+USER_LANG=$(echo $LANG|cut -d "_" -f1)
    6423+
    65  export JAVA=${JAVA:=java}
     24+export JAVA=${JAVA:=java}
    6625+export LANG=es_ES.utf8
    6726+
    68 +exec $JAVA -jar /usr/share/java/jclicreports.jar -language=$USER_LANG "$@"
    69  
    70 -exec $JAVA -jar /usr/share/java/jclicreports.jar "$@"
     27+exec $JAVA -jar /usr/share/java/jclicreports.jar
     28+
    7129+exit 0
     30+
Note: See TracChangeset for help on using the changeset viewer.