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/jclic_properties.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/src/player/edu/xtec/jclic/PlayerSettings.java
    35 +++ jclic-0.2.1.0/src/player/edu/xtec/jclic/PlayerSettings.java
    36 @@ -76,7 +76,7 @@ public class PlayerSettings extends Obje
    37      CFG_FILE="jclic.cfg",
    38      DEFAULT_SKIN="@default.xml",
    39      DEFAULT_REPORTER="TCPReporter",
    40 -    DEFAULT_REPORTER_PARAMS="path=localhost:9000";
    41 +    DEFAULT_REPORTER_PARAMS="path=server:9000";
     1--- a/src/player/edu/xtec/jclic/PlayerSettings.java
     2+++ b/src/player/edu/xtec/jclic/PlayerSettings.java
     3@@ -68,7 +68,7 @@
     4             CFG_FILE = "jclic.cfg",
     5             DEFAULT_SKIN = "@default.xml",
     6             DEFAULT_REPORTER = "TCPReporter",
     7-            DEFAULT_REPORTER_PARAMS = "path=localhost:9000";
     8+           DEFAULT_REPORTER_PARAMS="path=server:9000";
     9     public boolean fressaEnabled;
    4210 
    4311     /** Creates new PlayerSettings */
    44      public PlayerSettings(ResourceBridge rb, String fromPath /*, Options options*/){
    45 --- jclic-0.2.1.0.orig/src/report/jclicReports.properties
    46 +++ jclic-0.2.1.0/src/report/jclicReports.properties
     12--- a/src/report/jclicReports.properties
     13+++ b/src/report/jclicReports.properties
    4714@@ -10,7 +10,10 @@
    4815 #            PointBase: com.pointbase.jdbc.jdbcUniversalDriver
     
    5724 
    5825 #--------------------------------------------------------------------------
    59 @@ -21,15 +24,21 @@ dbDriver=sun.jdbc.odbc.JdbcOdbcDriver
    60  #            PointBase: jdbc:pointbase:jclic
    61  #            Oracle: jdbc:oracle:thin:@server.domain.com:1521:database
    62  #--------------------------------------------------------------------------
    63 -dbServer=jdbc:odbc:JClic
    64 +# ---Lliurex 02.05.2013 ---
    65 +#dbServer=jdbc:odbc:JClic
    66 +# ---Lliurex 02.05.2013 ---
    67 +dbServer=jdbc:mysql://127.0.0.1/JClicReports?autoReconnect=true&relaxAutoCommit=true
    68  
    69  
    70  #--------------------------------------------------------------------------
    71  # DB system username and password (not mandatory in some DBMS)
    72  #--------------------------------------------------------------------------
    73 -dbLogin=clic_user
    74 -dbPassword=clic_pwd
    75 -
    76 +#dbLogin=clic_user
    77 +#dbPassword=clic_pwd
    78 +# ---Lliurex 02.05.2013 ---
    79 +dbLogin=jclic_user
    80 +dbPassword=jclic_pwd
    81 +# ---Lliurex 02.05.2013 ---
    82  
    83  #--------------------------------------------------------------------------
    84  # If not exist, automatically create tables on first run
    85 @@ -110,6 +119,9 @@ graph_width=440
    86  graph_dist_width=192
    87  graph_height=155
    88  graph_header_height=25
    89 +# ---Lliurex 02.05.2013 ---
    90 +browser=firefox
    91 +# ---Lliurex 02.05.2013 ---
    92  graph_margin=8
    93  graph_color_bg=F0F8FF
    94  graph_color_text=000000
    95 --- jclic-0.2.1.0.orig/src/report/reportServlets/edu/xtec/jclic/jclicReports.properties
    96 +++ jclic-0.2.1.0/src/report/reportServlets/edu/xtec/jclic/jclicReports.properties
    97 @@ -10,7 +10,10 @@
    98  #            PointBase: com.pointbase.jdbc.jdbcUniversalDriver
    99  #            Oracle: oracle.jdbc.driver.OracleDriver
    100  #--------------------------------------------------------------------------
    101 -dbDriver=sun.jdbc.odbc.JdbcOdbcDriver
    102 +# ---Lliurex 02.05.2013 ---
    103 +dbDriver=com.mysql.jdbc.Driver
    104 +# ---Lliurex 02.05.2013 ---
    105 +#dbDriver=sun.jdbc.odbc.JdbcOdbcDriver
    106  
    107  
    108  #--------------------------------------------------------------------------
    109 @@ -21,14 +24,21 @@ dbDriver=sun.jdbc.odbc.JdbcOdbcDriver
     26@@ -21,14 +24,21 @@
    11027 #            PointBase: jdbc:pointbase:jclic
    11128 #            Oracle: jdbc:oracle:thin:@server.domain.com:1521:database
     
    13249 
    13350 #--------------------------------------------------------------------------
    134 @@ -115,6 +125,9 @@ graph_width=440
     51@@ -110,6 +120,9 @@
    13552 graph_dist_width=192
    13653 graph_height=155
     
    14259 graph_color_bg=F0F8FF
    14360 graph_color_text=000000
     61--- a/src/report/reportServlets/edu/xtec/jclic/jclicReports.properties
     62+++ b/src/report/reportServlets/edu/xtec/jclic/jclicReports.properties
     63@@ -10,7 +10,10 @@
     64 #            PointBase: com.pointbase.jdbc.jdbcUniversalDriver
     65 #            Oracle: oracle.jdbc.driver.OracleDriver
     66 #--------------------------------------------------------------------------
     67-dbDriver=sun.jdbc.odbc.JdbcOdbcDriver
     68+# ---Lliurex 02.05.2013 ---
     69+dbDriver=com.mysql.jdbc.Driver
     70+# ---Lliurex 02.05.2013 ---
     71+#dbDriver=sun.jdbc.odbc.JdbcOdbcDriver
     72 
     73 
     74 #--------------------------------------------------------------------------
     75@@ -21,14 +24,21 @@
     76 #            PointBase: jdbc:pointbase:jclic
     77 #            Oracle: jdbc:oracle:thin:@server.domain.com:1521:database
     78 #--------------------------------------------------------------------------
     79-dbServer=jdbc:odbc:JClic
     80+# ---Lliurex 02.05.2013 ---
     81+#dbServer=jdbc:odbc:JClic
     82+# ---Lliurex 02.05.2013 ---
     83+dbServer=jdbc:mysql://127.0.0.1/JClicReports?autoReconnect=true&relaxAutoCommit=true
     84 
     85 
     86 #--------------------------------------------------------------------------
     87 # DB system username and password (not mandatory in some DBMS)
     88 #--------------------------------------------------------------------------
     89-dbLogin=clic_user
     90-dbPassword=clic_pwd
     91+#dbLogin=clic_user
     92+#dbPassword=clic_pwd
     93+# ---Lliurex 02.05.2013 ---
     94+dbLogin=jclic_user
     95+dbPassword=jclic_pwd
     96+# ---Lliurex 02.05.2013 ---
     97 
     98 
     99 #--------------------------------------------------------------------------
     100@@ -115,6 +125,9 @@
     101 graph_dist_width=192
     102 graph_height=155
     103 graph_header_height=25
     104+# ---Lliurex 02.05.2013 ---
     105+browser=firefox
     106+# ---Lliurex 02.05.2013 ---
     107 graph_margin=8
     108 graph_color_bg=F0F8FF
     109 graph_color_text=000000
Note: See TracChangeset for help on using the changeset viewer.