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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-19 15:53:28 +0000 (Fri, 19 Aug 2011)
New Revision: 7495

Modified:
   trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
Log:
Use new libcommons

Modified: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2011-08-19 15:51:08 UTC (rev 7494)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2011-08-19 15:53:28 UTC (rev 7495)
@@ -8,7 +8,7 @@
  	webstart/pixelmed.jar \
  	webstart/commons-codec-1.3.jar \
 -	webstart/commons-net-ftp-2.0.jar \
-+	webstart/commons-net.jar \
++	webstart/commons-net2.jar \
  	webstart/hsqldb.jar \
  	webstart/jmdns.jar \
  	webstart/excalibur-bzip2-1.0.jar \
@@ -17,7 +17,7 @@
  DEPENDENCYRELEASEFILESWITHOUTREADME = \
  	lib/additional/commons-codec-1.3.jar \
 -	lib/additional/commons-net-ftp-2.0.jar \
-+	lib/additional/commons-net.jar \
++	lib/additional/commons-net2.jar \
  	lib/additional/excalibur-bzip2-1.0.jar \
  	lib/additional/hsqldb.jar \
  	lib/additional/vecmath1.2-1.14.jar \
@@ -26,7 +26,7 @@
  DOSEUTILITYDEPENDENCYRELEASEFILES = \
  	lib/additional/commons-codec-1.3.jar \
 -	lib/additional/commons-net-ftp-2.0.jar \
-+	lib/additional/commons-net.jar \
++	lib/additional/commons-net2.jar \
  	lib/additional/excalibur-bzip2-1.0.jar \
  	lib/additional/hsqldb.jar \
  	lib/additional/vecmath1.2-1.14.jar \
@@ -35,7 +35,7 @@
  	DoseUtility.app/Contents/Resources/Java/excalibur-bzip2-1.0.jar \
  	DoseUtility.app/Contents/Resources/Java/commons-codec-1.3.jar \
 -	DoseUtility.app/Contents/Resources/Java/commons-net-ftp-2.0.jar \
-+	DoseUtility.app/Contents/Resources/Java/commons-net.jar \
++	DoseUtility.app/Contents/Resources/Java/commons-net2.jar \
  	DoseUtility.app/Contents/Resources/Java/jmdns.jar \
  	DoseUtility.app/Contents/Resources/Java/jai_imageio.jar \
  	DoseUtility.app/Contents/Resources/DicomCleaner.icns \
@@ -44,7 +44,7 @@
  	jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
  
 -webstart/commons-net-ftp-2.0.jar:	lib/additional/commons-net-ftp-2.0.jar
-+webstart/commons-net.jar:	lib/additional/commons-net.jar
++webstart/commons-net.jar:	lib/additional/commons-net2.jar
  	mkdir -p webstart
  	cp $< $@
  	jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
@@ -53,7 +53,7 @@
  	cp $< $@
  
 -DoseUtility.app/Contents/Resources/Java/commons-net-ftp-2.0.jar:	lib/additional/commons-net-ftp-2.0.jar
-+DoseUtility.app/Contents/Resources/Java/commons-net.jar:	lib/additional/commons-net.jar
++DoseUtility.app/Contents/Resources/Java/commons-net2.jar:	lib/additional/commons-net2.jar
  	mkdir -p DoseUtility.app/Contents/Resources/Java
  	cp $< $@
  
@@ -62,7 +62,7 @@
  	rm -rf docs/javadoc
  	javadoc \
 -		-classpath .:lib/additional/excalibur-bzip2-1.0.jar:lib/additional/hsqldb.jar:lib/additional/vecmath1.2-1.14.jar:lib/additional/commons-codec-1.3.jar:lib/additional/commons-net-ftp-2.0.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit-4.8.1.jar \
-+		-classpath .:lib/additional/excalibur-bzip2-1.0.jar:lib/additional/hsqldb.jar:lib/additional/vecmath1.2-1.14.jar:lib/additional/commons-codec-1.3.jar:lib/additional/commons-net.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit-4.8.1.jar \
++		-classpath .:lib/additional/excalibur-bzip2-1.0.jar:lib/additional/hsqldb.jar:lib/additional/vecmath1.2-1.14.jar:lib/additional/commons-codec-1.3.jar:lib/additional/commons-net2.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit-4.8.1.jar \
  		-link http://download.oracle.com/javase/1.5.0/docs/api/ \
  		-link http://jpedal.org/javadoc/ \
  		-link http://www.hsqldb.org/doc/src/ \
@@ -75,7 +75,7 @@
  DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar
  
 -FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net-ftp-2.0.jar
-+FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net.jar
++FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net2.jar
  
  VIEWERADDITIONALJARS = ${DISPLAYADDITIONALJARS}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/jmdns.jar
  
@@ -88,7 +88,7 @@
      <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="commons-net2.jar" download="eager"/>
  	<jar href="hsqldb.jar" download="eager"/>
  	<jar href="jmdns.jar" download="eager"/>
  	<jar href="excalibur-bzip2-1.0.jar" download="lazy"/>