[med-svn] r5670 - trunk/packages/pixelmed/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-01-16 20:27:40 +0000 (Sun, 16 Jan 2011)
New Revision: 5670

Modified:
   trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
Log:
Missing changes

Modified: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2011-01-16 18:28:40 UTC (rev 5669)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2011-01-16 20:27:40 UTC (rev 5670)
@@ -1,8 +1,8 @@
 This patch fix compilation for ftp class
 Index: pixelmed-20101204/Makefile
 ===================================================================
---- pixelmed-20101204.orig/Makefile	2011-01-16 19:16:56.000000000 +0100
-+++ pixelmed-20101204/Makefile	2011-01-16 19:17:35.000000000 +0100
+--- pixelmed-20101204.orig/Makefile	2011-01-16 21:25:28.000000000 +0100
++++ pixelmed-20101204/Makefile	2011-01-16 21:25:29.000000000 +0100
 @@ -148,7 +148,7 @@
  WEBSTARTFILES = \
  	webstart/pixelmed.jar \
@@ -75,3 +75,29 @@
  		-link http://download.oracle.com/javase/1.5.0/docs/api/ \
  		-link http://jpedal.org/javadoc/ \
  		-link http://www.hsqldb.org/doc/src/ \
+Index: pixelmed-20101204/Makefile.common.mk
+===================================================================
+--- pixelmed-20101204.orig/Makefile.common.mk	2011-01-16 21:25:45.000000000 +0100
++++ pixelmed-20101204/Makefile.common.mk	2011-01-16 21:26:03.000000000 +0100
+@@ -33,7 +33,7 @@
+ 
+ DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar
+ 
+-FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net-ftp-2.0.jar
++FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net.jar
+ 
+ VIEWERADDITIONALJARS = ${DISPLAYADDITIONALJARS}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/jmdns.jar
+ 
+Index: pixelmed-20101204/webstart/DoseUtility.jnlp
+===================================================================
+--- pixelmed-20101204.orig/webstart/DoseUtility.jnlp	2011-01-16 21:25:48.000000000 +0100
++++ pixelmed-20101204/webstart/DoseUtility.jnlp	2011-01-16 21:25:56.000000000 +0100
+@@ -19,7 +19,7 @@
+     <j2se version="1.5+" java-vm-args="-Xmx768m"/>
+     <jar href="pixelmed.jar"/>
+ 	<jar href="commons-codec-1.3.jar" download="eager"/>
+-	<jar href="commons-net-ftp-2.0.jar" download="eager"/>
++	<jar href="commons-net.jar" download="eager"/>
+ 	<jar href="hsqldb.jar" download="eager"/>
+ 	<jar href="jmdns.jar" download="eager"/>
+ 	<jar href="excalibur-bzip2-1.0.jar" download="lazy"/>