[med-svn] r16912 - trunk/packages/biojava3/trunk/debian

[Olivier Sallou]

Author: osallou
Date: 2014-05-12 07:33:23 +0000 (Mon, 12 May 2014)
New Revision: 16912

Modified:
   trunk/packages/biojava3/trunk/debian/build.xml
   trunk/packages/biojava3/trunk/debian/changelog
   trunk/packages/biojava3/trunk/debian/control
Log:
fix FTBS 747781 due to a jar file name modification in a dependency

Modified: trunk/packages/biojava3/trunk/debian/build.xml
===================================================================
--- trunk/packages/biojava3/trunk/debian/build.xml	2014-05-11 12:17:19 UTC (rev 16911)
+++ trunk/packages/biojava3/trunk/debian/build.xml	2014-05-12 07:33:23 UTC (rev 16912)
@@ -21,7 +21,7 @@
 	<property environment="env"/>
 	<property name="project.jarfile.name" value="BJLIB.jar"/>	
 	
-	<property name="class.path" value="${lib.dir}/commons-logging.jar ${lib.dir}/commons-cli.jar ${lib.dir}/commons-collections.jar ${lib.dir}/commons-dbcp.jar ${lib.dir}/junit4.jar ${lib.dir}/commons-pool.jar ${lib.dir}/guava.jar ${lib.dir}/jgrapht0.8.jar ${lib.dir}/Jmol.jar /usr/share/icedtea-web/netx.jar ${lib.dir}/hamcrest.jar ${lib.dir}/json_simple.jar ${lib.dir}/commons-codec.jar ${lib.dir}/itext5.jar ${lib.dir}/Jmol.jar ${lib.dir}/log4j-1.2.jar"/>
+	<property name="class.path" value="${lib.dir}/commons-logging.jar ${lib.dir}/commons-cli.jar ${lib.dir}/commons-collections.jar ${lib.dir}/commons-dbcp.jar ${lib.dir}/junit4.jar ${lib.dir}/commons-pool.jar ${lib.dir}/guava.jar ${lib.dir}/jgrapht0.8.jar ${lib.dir}/Jmol.jar /usr/share/icedtea-web/netx.jar ${lib.dir}/hamcrest.jar ${lib.dir}/json_simple.jar ${lib.dir}/commons-codec.jar ${lib.dir}/itext5.jar ${lib.dir}/Jmol.jar ${lib.dir}/log4j-1.2.jar ${lib.dir}/json-simple.jar"/>
 								
 	<path id="compile.classpath">
                         <fileset dir="${lib.dir}">
@@ -38,7 +38,7 @@
 				<include name="jgrapht0.8.jar"/>
 				<include name="JmolApplet.jar"/>
 				<include name="hamcrest.jar"/>
-				<include name="json_simple.jar"/>
+				<include name="json-simple.jar"/>
 				<include name="log4j-1.2.jar"/>
 			</fileset>
 			<fileset dir="${dist.dir}">

Modified: trunk/packages/biojava3/trunk/debian/changelog
===================================================================
--- trunk/packages/biojava3/trunk/debian/changelog	2014-05-11 12:17:19 UTC (rev 16911)
+++ trunk/packages/biojava3/trunk/debian/changelog	2014-05-12 07:33:23 UTC (rev 16912)
@@ -1,3 +1,9 @@
+biojava3-live (3.0.7+dfsg-2) unstable; urgency=medium
+
+  * d/build.xml, d/control: change deps jar file name(Closes: #747781).
+
+ -- Olivier Sallou <osallou at debian.org>  Mon, 12 May 2014 09:31:04 +0200
+
 biojava3-live (3.0.7+dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/biojava3/trunk/debian/control
===================================================================
--- trunk/packages/biojava3/trunk/debian/control	2014-05-11 12:17:19 UTC (rev 16911)
+++ trunk/packages/biojava3/trunk/debian/control	2014-05-12 07:33:23 UTC (rev 16912)
@@ -9,7 +9,8 @@
  libcommons-cli-java, libguava-java (>= 11.0.1),
  libcommons-codec-java, libitext5-java (>= 5.4.1), libjmol-java,
  default-jdk (>= 1:1.6), junit4,javahelper (>=0.25),
- ant-optional, icedtea-netx, libhamcrest-java, libjson-simple-java,
+ ant-optional, icedtea-netx, libhamcrest-java,
+ libjson-simple-java (>=1.1.1),
  liblog4j1.2-java
 Build-Depends: debhelper (>= 9), ant
 Standards-Version: 3.9.5