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

[Olivier Sallou]

Author: osallou
Date: 2014-04-18 10:41:36 +0000 (Fri, 18 Apr 2014)
New Revision: 16725

Modified:
   trunk/packages/logol/trunk/debian/control
   trunk/packages/logol/trunk/debian/patches/fixLibPath
Log:
remove fuzzy from patch, update control to new release

Modified: trunk/packages/logol/trunk/debian/control
===================================================================
--- trunk/packages/logol/trunk/debian/control	2014-04-18 09:47:26 UTC (rev 16724)
+++ trunk/packages/logol/trunk/debian/control	2014-04-18 10:41:36 UTC (rev 16725)
@@ -12,13 +12,13 @@
  libcommons-lang-java, libcommons-logging-java, libxalan2-java,
  libxerces2-java, junit4, libgnumail-java,
  liblog4j1.2-java,texlive, texlive-latex-extra, tex4ht,
- libncursesw5-dev, ruby-cassiopee (>=0.1.12), ant-optional
+ libncursesw5-dev, ant-optional
 Standards-Version: 3.9.5
 Homepage: http://logol.genouest.org
 
 Package: logol
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java6-runtime,
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java7-runtime,
  ruby, gawk,
  libbiojava-java, libdrmaa-java, antlr3, libcommons-cli-java,
  libcommons-collections3-java, libcommons-configuration-java,

Modified: trunk/packages/logol/trunk/debian/patches/fixLibPath
===================================================================
--- trunk/packages/logol/trunk/debian/patches/fixLibPath	2014-04-18 09:47:26 UTC (rev 16724)
+++ trunk/packages/logol/trunk/debian/patches/fixLibPath	2014-04-18 10:41:36 UTC (rev 16725)
@@ -11,7 +11,7 @@
  
  	<property environment="env" />
  	
-@@ -57,6 +57,9 @@
+@@ -64,6 +64,9 @@
  		<fileset dir="${basedir}/lib">
  			<patternset refid="java.libs" />
  		</fileset>
@@ -21,7 +21,7 @@
  	</path>
  
  
-@@ -141,6 +144,25 @@
+@@ -148,6 +151,25 @@
  				<fileset dir="${basedir}/lib">
  					<include name="**/*.jar" />
  				</fileset>
@@ -47,7 +47,7 @@
  			</classpath>
  			<sysproperty key="logol.install" value="${basedir}" />
  			<sysproperty key="log4j.configuration" value="file://${basedir}/log4j.properties" />
-@@ -200,6 +222,7 @@
+@@ -210,6 +232,7 @@
  				<attribute name="Main-Class" value="org.irisa.genouest.logol.Logol" />
  				<attribute name="Implementation-Version" value="${version}" />
  				<attribute name="Implementation-Build" value="${build.nb}" />