[med-svn] r21698 - in trunk/packages/logol/trunk/debian: . patches

[Olivier Sallou]

Author: osallou
Date: 2016-04-12 09:52:55 +0000 (Tue, 12 Apr 2016)
New Revision: 21698

Modified:
   trunk/packages/logol/trunk/debian/docs
   trunk/packages/logol/trunk/debian/patches/fixLibPath
   trunk/packages/logol/trunk/debian/patches/fix_antlr35
   trunk/packages/logol/trunk/debian/patches/setDebianDirs
Log:
update patches and doc, updated upstream in git repo

Modified: trunk/packages/logol/trunk/debian/docs
===================================================================
--- trunk/packages/logol/trunk/debian/docs	2016-04-12 09:26:40 UTC (rev 21697)
+++ trunk/packages/logol/trunk/debian/docs	2016-04-12 09:52:55 UTC (rev 21698)
@@ -1,5 +1,5 @@
-changelog
-README.txt
+CHANGELOG.txt
+README.md
 prolog/SWI-README
 Doc/LogolGrammar.txt
 Doc/tutorial.pdf

Modified: trunk/packages/logol/trunk/debian/patches/fixLibPath
===================================================================
--- trunk/packages/logol/trunk/debian/patches/fixLibPath	2016-04-12 09:26:40 UTC (rev 21697)
+++ trunk/packages/logol/trunk/debian/patches/fixLibPath	2016-04-12 09:52:55 UTC (rev 21698)
@@ -73,3 +73,13 @@
  			</manifest>
  		</jar>
  	</target>
+--- a/log4j.properties
++++ b/log4j.properties
+@@ -13,6 +13,6 @@
+ 
+ 
+ log4j.appender.A2=org.apache.log4j.FileAppender
+-log4j.appender.A2.File=/tmp/logol.log
++log4j.appender.A2.File=/var/log/logol/logol.log
+ log4j.appender.A2.layout=org.apache.log4j.PatternLayout
+ log4j.appender.A2.layout.ConversionPattern=%d{MM-dd at HH:mm:ss} %-5p (%13F:%L) %3x - %m%n

Modified: trunk/packages/logol/trunk/debian/patches/fix_antlr35
===================================================================
--- trunk/packages/logol/trunk/debian/patches/fix_antlr35	2016-04-12 09:26:40 UTC (rev 21697)
+++ trunk/packages/logol/trunk/debian/patches/fix_antlr35	2016-04-12 09:52:55 UTC (rev 21698)
@@ -25,3 +25,11 @@
  //( op=(','| ';' | '|')?  (ent=constrainedEntity[parentId] { $value+=curView.execute($ent.predicate,$op.text,0,countVar); })  )*
  
  parameters returns [ int type, String intervalParam]
+--- a/test/repeat2.logol
++++ b/test/repeat2.logol
+@@ -1,4 +1,4 @@
+ def:{
+ }
+-mod1()==>"aaa",repeat("acgt")+[0,2]
++mod1()==>"aaa",repeat("acgt" ,[0,_])+[0,2]
+ mod1()==*>SEQ1

Modified: trunk/packages/logol/trunk/debian/patches/setDebianDirs
===================================================================
--- trunk/packages/logol/trunk/debian/patches/setDebianDirs	2016-04-12 09:26:40 UTC (rev 21697)
+++ trunk/packages/logol/trunk/debian/patches/setDebianDirs	2016-04-12 09:52:55 UTC (rev 21698)
@@ -41,13 +41,3 @@
 -java $JAVA_OPTS -Dlogol.install=$LOGOL_HOME -Dlogol.conf=$LOGOL_HOME/prolog/logol.properties -Dlog4j.configuration=file://$LOGOL_LOG4J -classpath  $LOGOL_HOME/lib/xalan.jar:$LOGOL_HOME/lib/xercesImpl.jar:$LOGOL_HOME/lib/xml-apis.jar:$LOGOL_HOME/lib/mail.jar:$LOGOL_HOME/lib/activation.jar:$LOGOL_HOME/lib/biojava.jar:$LOGOL_HOME/lib/bytecode:$LOGOL_HOME/lib/drmaa.jar:$LOGOL_HOME/lib/commons-configuration-1.5.jar:$LOGOL_HOME/lib/LogolExec.jar:$LOGOL_HOME/lib/commons-cli-1.1.jar:$LOGOL_HOME/lib/commons-collections-3.2.1.jar:$LOGOL_HOME/lib/commons-lang-2.4.jar:$LOGOL_HOME/lib/commons-logging-1.1.1.jar:$LOGOL_HOME/lib/log4j-1.2.15.jar:$LOGOL_HOME/lib/antlrworks-1.4.3.jar  org.irisa.genouest.logol.dispatcher.Dispatch  $*
 +java -Xms512m -Xmx1024m -Dlogol.install=$LOGOL_HOME -Dlogol.conf=$LOGOL_HOME/prolog/logol.properties -Dlog4j.configuration=file://$LOGOL_LOG4J -classpath  $LOGOL_HOME/lib/xalan.jar:$LOGOL_HOME/lib/xercesImpl.jar:$LOGOL_HOME/lib/xml-apis.jar:$LOGOL_HOME/lib/mail.jar:$LOGOL_HOME/lib/activation.jar:$LOGOL_HOME/lib/biojava.jar:$LOGOL_HOME/lib/bytecode:$LOGOL_HOME/lib/drmaa.jar:$LOGOL_HOME/lib/commons-configuration.jar:$LOGOL_HOME/lib/LogolExec.jar:$LOGOL_HOME/lib/commons-cli.jar:$LOGOL_HOME/lib/commons-collections.jar:$LOGOL_HOME/lib/commons-lang.jar:$LOGOL_HOME/lib/commons-logging.jar:$LOGOL_HOME/lib/log4j-1.2.jar:$LOGOL_HOME/lib/antlr.jar  org.irisa.genouest.logol.dispatcher.Dispatch  $*
  
---- a/log4j.properties
-+++ b/log4j.properties
-@@ -13,6 +13,6 @@
- 
- 
- log4j.appender.A2=org.apache.log4j.FileAppender
--log4j.appender.A2.File=/tmp/logol.log
-+log4j.appender.A2.File=/var/log/logol/logol.log
- log4j.appender.A2.layout=org.apache.log4j.PatternLayout
- log4j.appender.A2.layout.ConversionPattern=%d{MM-dd at HH:mm:ss} %-5p (%13F:%L) %3x - %m%n