[med-svn] r7485 - in trunk/packages/pixelmed/trunk/debian: . patches

Mathieu Malaterre malat-guest at alioth.debian.org
Fri Aug 19 14:54:48 UTC 2011 

Author: malat-guest
Date: 2011-08-19 14:54:48 +0000 (Fri, 19 Aug 2011)
New Revision: 7485

Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/control
   trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
   trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
   trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
Log:
Prepare new release

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2011-08-19 14:20:07 UTC (rev 7484)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2011-08-19 14:54:48 UTC (rev 7485)
@@ -1,3 +1,12 @@
+pixelmed (20110717-1) unstable; urgency=low
+
+  * New upstream
+  * libcommons-net2-java >= 2.2 to resolve org.apache.commons.net.ftp.FTPSClient
+    Closes: #610296
+  * Bump Standards-Version to 3.9.2 no changes needed.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 19 Aug 2011 16:44:35 +0200
+
 pixelmed (20101204-1) unstable; urgency=low
 
   * New upstream

Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control	2011-08-19 14:20:07 UTC (rev 7484)
+++ trunk/packages/pixelmed/trunk/debian/control	2011-08-19 14:54:48 UTC (rev 7485)
@@ -5,8 +5,8 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Build-Depends: debhelper (>= 7), quilt
-Build-Depends-Indep: javahelper, default-jdk, libhsqldb-java, libcommons-net-java, libvecmath-java, libjmdns-java, junit4
-Standards-Version: 3.9.1
+Build-Depends-Indep: javahelper, default-jdk, libhsqldb-java, libcommons-net2-java (>= 2.2), libvecmath-java, libjmdns-java, junit4
+Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/pixelmed/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/pixelmed/trunk/
 Homepage: http://www.pixelmed.com

Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2011-08-19 14:20:07 UTC (rev 7484)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2011-08-19 14:54:48 UTC (rev 7485)
@@ -1,9 +1,9 @@
 Set include path according to debian layout
 
-Index: pixelmed-20101204/com/pixelmed/display/Makefile
+Index: pixelmed-20110717/com/pixelmed/display/Makefile
 ===================================================================
---- pixelmed-20101204.orig/com/pixelmed/display/Makefile	2010-04-09 12:36:49.000000000 +0200
-+++ pixelmed-20101204/com/pixelmed/display/Makefile	2011-01-16 19:10:53.000000000 +0100
+--- pixelmed-20110717.orig/com/pixelmed/display/Makefile	2010-04-09 12:36:49.000000000 +0200
++++ pixelmed-20110717/com/pixelmed/display/Makefile	2011-08-19 16:52:07.000000000 +0200
 @@ -212,7 +212,7 @@
  		com.pixelmed.display.DicomImageViewer ${PATHTOHOME}/Pictures/Medical/NEMA97CD/DICOMDIR
  
@@ -13,10 +13,10 @@
  
  testvieweronallmfmrimages:	
  	(for i in ${PATHTOROOT}/../../nemamfmr/DISCIMG/IMAGES/*; do echo "$$i"; java -Xms512m -Xmx512m -cp ${PATHTOROOT}:${VIEWERADDITIONALJARS} com.pixelmed.display.DicomImageViewer "$$i"; done)
-Index: pixelmed-20101204/com/pixelmed/geometry/Makefile
+Index: pixelmed-20110717/com/pixelmed/geometry/Makefile
 ===================================================================
---- pixelmed-20101204.orig/com/pixelmed/geometry/Makefile	2007-07-27 18:43:36.000000000 +0200
-+++ pixelmed-20101204/com/pixelmed/geometry/Makefile	2011-01-16 19:10:53.000000000 +0100
+--- pixelmed-20110717.orig/com/pixelmed/geometry/Makefile	2007-07-27 18:43:36.000000000 +0200
++++ pixelmed-20110717/com/pixelmed/geometry/Makefile	2011-08-19 16:52:07.000000000 +0200
 @@ -16,7 +16,7 @@
  .SUFFIXES:	.class .java
  
@@ -26,10 +26,10 @@
  		-sourcepath ${PATHTOROOT} $<
  
  archive:
-Index: pixelmed-20101204/Makefile.common.mk
+Index: pixelmed-20110717/Makefile.common.mk
 ===================================================================
---- pixelmed-20101204.orig/Makefile.common.mk	2010-11-13 00:52:13.000000000 +0100
-+++ pixelmed-20101204/Makefile.common.mk	2011-01-16 19:10:53.000000000 +0100
+--- pixelmed-20110717.orig/Makefile.common.mk	2011-05-02 09:22:11.000000000 +0200
++++ pixelmed-20110717/Makefile.common.mk	2011-08-19 16:52:07.000000000 +0200
 @@ -4,9 +4,10 @@
  
  PATHTOHOME = /Users/dclunie
@@ -43,15 +43,15 @@
  
  PATHTODCTOOLSUPPORTFROMROOT = ../../dctool.support
  
-@@ -17,6 +18,7 @@
- PATHTOTESTFILESFROMROOT = ./testpaths
+@@ -19,6 +20,7 @@
+ PATHTOTESTRESULTSFROMROOT = ./testresults
  
  PATHTOADDITIONAL = ${PATHTOROOT}/${ADDITIONALJARDIRINROOT}
 +PATHTOADDITIONAL = /usr/share/java
  
  PATHTODCTOOLSUPPORT = ${PATHTOROOT}/${PATHTODCTOOLSUPPORTFROMROOT}
  
-@@ -24,7 +26,8 @@
+@@ -26,7 +28,8 @@
  
  # excalibur not needed for compile, but useful for execution if available ...
  # commons-codec not needed for compile, but useful for execution if available ...

Modified: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2011-08-19 14:20:07 UTC (rev 7484)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2011-08-19 14:54:48 UTC (rev 7485)
@@ -1,9 +1,9 @@
 This patch fix compilation for ftp class
-Index: pixelmed-20101204/Makefile
+Index: pixelmed-20110717/Makefile
 ===================================================================
---- 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 @@
+--- pixelmed-20110717.orig/Makefile	2011-08-19 16:52:23.000000000 +0200
++++ pixelmed-20110717/Makefile	2011-08-19 16:52:30.000000000 +0200
+@@ -165,7 +165,7 @@
  WEBSTARTFILES = \
  	webstart/pixelmed.jar \
  	webstart/commons-codec-1.3.jar \
@@ -12,7 +12,7 @@
  	webstart/hsqldb.jar \
  	webstart/jmdns.jar \
  	webstart/excalibur-bzip2-1.0.jar \
-@@ -184,7 +184,7 @@
+@@ -203,7 +203,7 @@
  
  DEPENDENCYRELEASEFILESWITHOUTREADME = \
  	lib/additional/commons-codec-1.3.jar \
@@ -21,7 +21,7 @@
  	lib/additional/excalibur-bzip2-1.0.jar \
  	lib/additional/hsqldb.jar \
  	lib/additional/vecmath1.2-1.14.jar \
-@@ -208,7 +208,7 @@
+@@ -227,7 +227,7 @@
  
  DOSEUTILITYDEPENDENCYRELEASEFILES = \
  	lib/additional/commons-codec-1.3.jar \
@@ -30,7 +30,7 @@
  	lib/additional/excalibur-bzip2-1.0.jar \
  	lib/additional/hsqldb.jar \
  	lib/additional/vecmath1.2-1.14.jar \
-@@ -275,7 +275,7 @@
+@@ -294,7 +294,7 @@
  	DoseUtility.app/Contents/Resources/Java/hsqldb.jar \
  	DoseUtility.app/Contents/Resources/Java/excalibur-bzip2-1.0.jar \
  	DoseUtility.app/Contents/Resources/Java/commons-codec-1.3.jar \
@@ -39,7 +39,7 @@
  	DoseUtility.app/Contents/Resources/Java/jmdns.jar \
  	DoseUtility.app/Contents/Resources/Java/jai_imageio.jar \
  	DoseUtility.app/Contents/Resources/DicomCleaner.icns \
-@@ -423,7 +423,7 @@
+@@ -443,7 +443,7 @@
  	cp $< $@
  	jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
  
@@ -48,16 +48,7 @@
  	mkdir -p webstart
  	cp $< $@
  	jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
-@@ -570,7 +570,7 @@
- 	DoseUtility.app/Contents/Resources/Java/hsqldb.jar \
- 	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/jmdns.jar \
- 	DoseUtility.app/Contents/Resources/Java/jai_imageio.jar \
- 	DoseUtility.app/Contents/Resources/DoseUtility.icns \
-@@ -592,7 +592,7 @@
+@@ -698,7 +698,7 @@
  	mkdir -p DoseUtility.app/Contents/Resources/Java
  	cp $< $@
  
@@ -66,7 +57,7 @@
  	mkdir -p DoseUtility.app/Contents/Resources/Java
  	cp $< $@
  
-@@ -790,7 +790,7 @@
+@@ -897,7 +897,7 @@
  javadoc:
  	rm -rf docs/javadoc
  	javadoc \
@@ -75,11 +66,11 @@
  		-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
+Index: pixelmed-20110717/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 @@
+--- pixelmed-20110717.orig/Makefile.common.mk	2011-08-19 16:52:07.000000000 +0200
++++ pixelmed-20110717/Makefile.common.mk	2011-08-19 16:52:30.000000000 +0200
+@@ -35,7 +35,7 @@
  
  DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar
  
@@ -88,10 +79,10 @@
  
  VIEWERADDITIONALJARS = ${DISPLAYADDITIONALJARS}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/jmdns.jar
  
-Index: pixelmed-20101204/webstart/DoseUtility.jnlp
+Index: pixelmed-20110717/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
+--- pixelmed-20110717.orig/webstart/DoseUtility.jnlp	2010-11-18 08:09:08.000000000 +0100
++++ pixelmed-20110717/webstart/DoseUtility.jnlp	2011-08-19 16:52:30.000000000 +0200
 @@ -19,7 +19,7 @@
      <j2se version="1.5+" java-vm-args="-Xmx768m"/>
      <jar href="pixelmed.jar"/>

Modified: trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/makefile.patch	2011-08-19 14:20:07 UTC (rev 7484)
+++ trunk/packages/pixelmed/trunk/debian/patches/makefile.patch	2011-08-19 14:54:48 UTC (rev 7485)
@@ -1,10 +1,10 @@
 *.dat files were removed
 
-Index: pixelmed-20101204/Makefile
+Index: pixelmed-20110717/Makefile
 ===================================================================
---- pixelmed-20101204.orig/Makefile	2010-11-25 15:01:22.000000000 +0100
-+++ pixelmed-20101204/Makefile	2011-01-16 19:19:33.000000000 +0100
-@@ -326,7 +326,7 @@
+--- pixelmed-20110717.orig/Makefile	2011-05-06 17:36:22.000000000 +0200
++++ pixelmed-20110717/Makefile	2011-08-19 16:52:23.000000000 +0200
+@@ -346,7 +346,7 @@
  		com/pixelmed/event/*.class \
  		com/pixelmed/display/event/*.class \
  		com/pixelmed/geometry/*.class \

More information about the debian-med-commit mailing list