[med-svn] r19441 - in trunk/packages/libmpj-java/trunk/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2015-06-29 14:49:30 +0000 (Mon, 29 Jun 2015)
New Revision: 19441

Modified:
   trunk/packages/libmpj-java/trunk/debian/changelog
   trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch
Log:
Fixed the build failure caused by the update of commons-codec



Modified: trunk/packages/libmpj-java/trunk/debian/changelog
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/changelog	2015-06-29 14:03:26 UTC (rev 19440)
+++ trunk/packages/libmpj-java/trunk/debian/changelog	2015-06-29 14:49:30 UTC (rev 19441)
@@ -1,3 +1,10 @@
+mpj (0.42+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure caused by the update of commons-codec
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 29 Jun 2015 16:48:07 +0200
+
 mpj (0.42+dfsg-1) unstable; urgency=medium
 
   * New upstream version (adapted patch)

Modified: trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch
===================================================================
--- trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch	2015-06-29 14:03:26 UTC (rev 19440)
+++ trunk/packages/libmpj-java/trunk/debian/patches/use_debian_packaged_jars.patch	2015-06-29 14:49:30 UTC (rev 19441)
@@ -12,7 +12,7 @@
          
  	<javac srcdir="${src.dir}" 
 -	classpath="lib/wrapper.jar:lib/org.mortbay.jetty.jar:lib/log4j-1.2.11.jar:lib/commons-cli-1.2.jar:lib\commons-codec-1.8.jar:lib\commons-io-2.4.jar" 
-+	classpath="/usr/share/java/wrapper.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/commons-cli-1.2.jar:/usr/share/java/commons-codec-1.9.jar:/usr/share/java/commons-io-2.4.jar" 
++	classpath="/usr/share/java/wrapper.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-io.jar" 
  	sourcepath="${src.dir}"
  	debug="true"
  	/>
@@ -103,7 +103,7 @@
  		               value="runtime.daemon.MPJDaemon" /> 
  					<attribute name="Class-path" 
 -		    value="log4j-1.2.11.jar commons-codec-1.8.jar commons-io-2.4.jar runtimecommon.jar "/> 
-+		    value="log4j-1.2.jar commons-codec-1.8.jar commons-io-2.4.jar runtimecommon.jar "/> 
++		    value="log4j-1.2.jar commons-codec.jar commons-io.jar runtimecommon.jar "/> 
  				</manifest>  
  			</jar>
  
@@ -139,7 +139,7 @@
        <javadoc
          destdir="${doc.dir}/javadocs"
 -	classpath="${lib.dir}/org.mortbay.jetty.jar:${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.11.jar;${lib.dir}/commons-cli-1.2.jar">
-+	classpath="${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.jar;${lib.dir}/commons-cli-1.2.jar">
++	classpath="${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.jar;${lib.dir}/commons-cli.jar">
  			<fileset dir="${mpi.dir}" defaultexcludes="yes">
  				<include name="**/Cartcomm.java"/>
  				<include name="**/CartParms.java"/>