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

[Olivier Sallou]

Author: osallou
Date: 2016-04-12 09:26:40 +0000 (Tue, 12 Apr 2016)
New Revision: 21697

Modified:
   trunk/packages/logol/trunk/debian/patches/fixLibPath
   trunk/packages/logol/trunk/debian/rules
Log:
udpates patches for 1.7.4

Modified: trunk/packages/logol/trunk/debian/patches/fixLibPath
===================================================================
--- trunk/packages/logol/trunk/debian/patches/fixLibPath	2016-04-12 09:16:39 UTC (rev 21696)
+++ trunk/packages/logol/trunk/debian/patches/fixLibPath	2016-04-12 09:26:40 UTC (rev 21697)
@@ -11,7 +11,7 @@
  
  	<property environment="env" />
  	
-@@ -64,6 +64,9 @@
+@@ -64,13 +64,16 @@
  		<fileset dir="${basedir}/lib">
  			<patternset refid="java.libs" />
  		</fileset>
@@ -21,7 +21,25 @@
  	</path>
  
  
-@@ -148,6 +151,25 @@
+ 
+ 	<target name="clean" description="Delete all generated files">
+-		<delete dir="${bin.dir}" />
+-		<delete>
++		<delete dir="${bin.dir}" quiet="true" />
++		<delete quiet="true">
+ 			<fileset dir="${test.dir}/tmp">
+ 				<include name="*"/>
+ 			</fileset>
+@@ -139,6 +142,8 @@
+ 
+ 	<target name="test_swi" description="unit test with swi-prolog"
+ 		depends="setup,compile_swi_exe,create-jar">
++		<mkdir dir="test/tmp" />
++		<mkdir dir="test/results" />
+ 		<exec executable="swipl">
+ 			<arg line=" -f ${basedir}/prolog/unitTest/swi-unit.pl -- ${basedir}/prolog/unitTest/sampleUnit.pro ${basedir}/prolog/sicstus.pl ${work.dir}/SwiLogolSelfTest-PUnit-${build.nb}.xml ${basedir}/prolog/unitTest/plunittest.pro ${basedir}/prolog/logol.pl ${basedir}/test/test.fasta" />
+ 		</exec>
+@@ -148,6 +153,25 @@
  				<fileset dir="${basedir}/lib">
  					<include name="**/*.jar" />
  				</fileset>
@@ -47,7 +65,7 @@
  			</classpath>
  			<sysproperty key="logol.install" value="${basedir}" />
  			<sysproperty key="log4j.configuration" value="file://${basedir}/log4j.properties" />
-@@ -210,6 +232,7 @@
+@@ -210,6 +234,7 @@
  				<attribute name="Main-Class" value="org.irisa.genouest.logol.Logol" />
  				<attribute name="Implementation-Version" value="${version}" />
  				<attribute name="Implementation-Build" value="${build.nb}" />

Modified: trunk/packages/logol/trunk/debian/rules
===================================================================
--- trunk/packages/logol/trunk/debian/rules	2016-04-12 09:16:39 UTC (rev 21696)
+++ trunk/packages/logol/trunk/debian/rules	2016-04-12 09:26:40 UTC (rev 21697)
@@ -13,8 +13,6 @@
 override_dh_auto_build:
 	mv tools/pldoc.sty tools/pldoc.sty.upstream
 	dh_auto_build -- $(DEB_ANT_ARGS)
-	mkdir -p test/tmp
-	mkdir -p test/results
 	ant -f build.xml doc
 
 override_dh_install: