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

Andreas Tille tille at moszumanska.debian.org
Tue Jul 21 14:02:14 UTC 2015 

Author: tille
Date: 2015-07-21 14:02:13 +0000 (Tue, 21 Jul 2015)
New Revision: 19685

Modified:
   trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch
   trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
   trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch
   trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch
   trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch
Log:
Refresh some patches


Modified: trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch	2015-07-21 06:54:10 UTC (rev 19684)
+++ trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch	2015-07-21 14:02:13 UTC (rev 19685)
@@ -3,11 +3,9 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20140326/com/pixelmed/display/DicomImageViewer.java
-===================================================================
---- pixelmed-20140326.orig/com/pixelmed/display/DicomImageViewer.java	2013-02-20 19:27:29.000000000 +0100
-+++ pixelmed-20140326/com/pixelmed/display/DicomImageViewer.java	2014-04-09 22:30:06.805214974 +0200
-@@ -63,7 +63,7 @@
+--- a/com/pixelmed/display/DicomImageViewer.java
++++ b/com/pixelmed/display/DicomImageViewer.java
+@@ -63,7 +63,7 @@ public class DicomImageViewer extends Ap
  	static final char screenSnapShotKeyChar = 'K';
  
  	/***/
@@ -16,11 +14,9 @@
  
  	// property names ...
  
-Index: pixelmed-20140326/com/pixelmed/utils/FileUtilities.java
-===================================================================
---- pixelmed-20140326.orig/com/pixelmed/utils/FileUtilities.java	2013-12-11 15:04:05.000000000 +0100
-+++ pixelmed-20140326/com/pixelmed/utils/FileUtilities.java	2014-04-09 22:30:06.809214974 +0200
-@@ -234,7 +234,8 @@
+--- a/com/pixelmed/utils/FileUtilities.java
++++ b/com/pixelmed/utils/FileUtilities.java
+@@ -235,7 +235,8 @@ public class FileUtilities {
  	 * @param	fileName	 the file name to make a path to
  	 */
  	static public final String makePathToFileInUsersHomeDirectory(String fileName) {

Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2015-07-21 06:54:10 UTC (rev 19684)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2015-07-21 14:02:13 UTC (rev 19685)
@@ -1,25 +1,10 @@
 Description: Set include path according to debian layout
 Forwarded: not-needed
 Author: Mathieu Malaterre <malat at debian.org>
-Last-Update: 2012-05-05
+Last-Update: Tue, 21 Jul 2015 08:51:28 +0200
 
-Index: pixelmed-20131018/com/pixelmed/display/Makefile
-===================================================================
---- pixelmed-20131018.orig/com/pixelmed/display/Makefile	2013-10-16 18:16:27.000000000 +0200
-+++ pixelmed-20131018/com/pixelmed/display/Makefile	2013-12-10 17:50:13.462149836 +0100
-@@ -246,7 +246,7 @@
- 		com.pixelmed.display.DicomImageViewer ${PATHTOHOME}/Pictures/Medical/NEMA97CD/DICOMDIR
- 
- testviewerontestimages:	
--	(cd ${PATHTOROOT}; for i in `cat ${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/testlist`; do echo "$$i"; java -Xms512m -Xmx512m -cp pixelmed.jar:${PATHTOADDITIONAL}/excalibur-bzip2-1.0.jar:${PATHTOADDITIONAL}/hsqldb.jar:${PATHTOADDITIONAL}/vecmath1.2-1.14.jar:${PATHTOADDITIONAL}/jai_imageio.jar:${PATHTOADDITIONAL}/commons-codec-1.3.jar:${PATHTOADDITIONAL}/jmdns.jar com.pixelmed.display.DicomImageViewer "${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/$$i"; done)
-+	(cd ${PATHTOROOT}; for i in `cat ${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/testlist`; do echo "$$i"; java -Xms512m -Xmx512m -cp pixelmed.jar:${PATHTOADDITIONAL}/excalibur-bzip2-1.0.jar:${PATHTOADDITIONAL}/hsqldb.jar:${PATHTOADDITIONAL}/vecmath.jar:${PATHTOADDITIONAL}/jai_imageio.jar:${PATHTOADDITIONAL}/commons-codec.jar:${PATHTOADDITIONAL}/jmdns.jar com.pixelmed.display.DicomImageViewer "${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/$$i"; done)
- 
- 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-20131018/Makefile.common.mk
-===================================================================
---- pixelmed-20131018.orig/Makefile.common.mk	2013-07-21 17:47:49.000000000 +0200
-+++ pixelmed-20131018/Makefile.common.mk	2013-12-10 17:50:13.462149836 +0100
+--- a/Makefile.common.mk
++++ b/Makefile.common.mk
 @@ -4,9 +4,10 @@
  
  PATHTOHOME = /Users/dclunie
@@ -33,7 +18,7 @@
  
  PATHTODCTOOLSUPPORTFROMROOT = ../../dctool.support
  
-@@ -19,6 +20,7 @@
+@@ -19,20 +20,21 @@ PATHTOTESTFILESFROMROOT = ./testpaths
  PATHTOTESTRESULTSFROMROOT = ./testresults
  
  PATHTOADDITIONAL = ${PATHTOROOT}/${ADDITIONALJARDIRINROOT}
@@ -41,26 +26,31 @@
  
  PATHTODCTOOLSUPPORT = ${PATHTOROOT}/${PATHTODCTOOLSUPPORTFROMROOT}
  
-@@ -26,7 +28,8 @@
+ PATHTODCTOOLS = ${PATHTOROOT}/${PATHTODCTOOLSFROMROOT}
  
- # excalibur not needed for compile, but useful for execution if available ...
+-BZIP2ADDITIONALJAR = ${PATHTOADDITIONAL}/commons-compress-1.9.jar
++BZIP2ADDITIONALJAR = ${PATHTOADDITIONAL}/commons-compress.jar
+ 
+ JIIOADDITIONALJARS = ${PATHTOADDITIONAL}/jai_imageio.jar
+ 
+-VECMATHADDITIONALJAR = ${PATHTOADDITIONAL}/vecmath1.2-1.14.jar
++VECMATHADDITIONALJAR = ${PATHTOADDITIONAL}/vecmath.jar
+ 
+ # commons-compress for bzip2 not needed for compile, but useful for execution if available ...
  # commons-codec not needed for compile, but useful for execution if available ...
--DICOMADDITIONALJARS = ${PATHTOADDITIONAL}/excalibur-bzip2-1.0.jar:${PATHTOADDITIONAL}/commons-codec-1.3.jar:${PATHTOADDITIONAL}/vecmath1.2-1.14.jar
-+#DICOMADDITIONALJARS = ${PATHTOADDITIONAL}/excalibur-bzip2-1.0.jar:${PATHTOADDITIONAL}/commons-codec-1.3.jar:${PATHTOADDITIONAL}/vecmath1.2-1.14.jar
-+DICOMADDITIONALJARS = ${PATHTOADDITIONAL}/excalibur-bzip2-1.0.jar:${PATHTOADDITIONAL}/commons-codec.jar:${PATHTOADDITIONAL}/vecmath.jar
+-DICOMADDITIONALJARS = ${BZIP2ADDITIONALJAR}:${PATHTOADDITIONAL}/commons-codec-1.3.jar:${VECMATHADDITIONALJAR}
++DICOMADDITIONALJARS = ${BZIP2ADDITIONALJAR}:${PATHTOADDITIONAL}/commons-codec.jar:${VECMATHADDITIONALJAR}
  
- DISPLAYADDITIONALJARS = ${DICOMADDITIONALJARS}:${PATHTOADDITIONAL}/jai_imageio.jar:${PATHTOADDITIONAL}/clibwrapper_jiio.jar
+ DISPLAYADDITIONALJARS = ${DICOMADDITIONALJARS}:${JIIOADDITIONALJARS}
  
-Index: pixelmed-20131018/com/pixelmed/geometry/Makefile
-===================================================================
---- pixelmed-20131018.orig/com/pixelmed/geometry/Makefile	2013-01-19 20:09:13.000000000 +0100
-+++ pixelmed-20131018/com/pixelmed/geometry/Makefile	2013-12-10 17:50:13.462149836 +0100
-@@ -16,7 +16,7 @@
- .SUFFIXES:	.class .java
+--- a/com/pixelmed/display/Makefile
++++ b/com/pixelmed/display/Makefile
+@@ -249,7 +249,7 @@ testnema97:	DicomImageViewer.class #${PA
+ 		com.pixelmed.display.DicomImageViewer ${PATHTOHOME}/Pictures/Medical/NEMA97CD/DICOMDIR
  
- .java.class:
--	javac ${JAVACOPTIONS} -classpath ${PATHTOROOT}:${PATHTOADDITIONAL}/vecmath1.2-1.14.jar -sourcepath ${PATHTOROOT} $<
-+	javac ${JAVACOPTIONS} -classpath ${PATHTOROOT}:${PATHTOADDITIONAL}/vecmath.jar -sourcepath ${PATHTOROOT} $<
+ testviewerontestimages:	
+-	(cd ${PATHTOROOT}; for i in `cat ${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/testlist`; do echo "$$i"; java -Xms512m -Xmx512m -cp pixelmed.jar:${BZIP2ADDITIONALJAR}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/vecmath1.2-1.14.jar:${PATHTOADDITIONAL}/jai_imageio.jar:${PATHTOADDITIONAL}/commons-codec-1.3.jar:${PATHTOADDITIONAL}/jmdns.jar com.pixelmed.display.DicomImageViewer "${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/$$i"; done)
++	(cd ${PATHTOROOT}; for i in `cat ${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/testlist`; do echo "$$i"; java -Xms512m -Xmx512m -cp pixelmed.jar:${BZIP2ADDITIONALJAR}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/vecmath.jar:${PATHTOADDITIONAL}/jai_imageio.jar:${PATHTOADDITIONAL}/commons-codec.jar:${PATHTOADDITIONAL}/jmdns.jar com.pixelmed.display.DicomImageViewer "${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/$$i"; done)
  
- archive:
- 	tar -cvf - Makefile *.java | gzip -best > ../../../geometry.`date '+%Y%m%d'`.tar.gz
+ testvieweronallmfmrimages:	
+ 	(for i in ${PATHTOROOT}/../../nemamfmr/DISCIMG/IMAGES/*; do echo "$$i"; java -Xms512m -Xmx512m -cp ${PATHTOROOT}:${VIEWERADDITIONALJARS} com.pixelmed.display.DicomImageViewer "$$i"; done)

Modified: trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch	2015-07-21 06:54:10 UTC (rev 19684)
+++ trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch	2015-07-21 14:02:13 UTC (rev 19685)
@@ -1,28 +1,26 @@
 Description: Fix jnlp path
 Forwarded: not-needed
 Author: Mathieu Malaterre <malat at debian.org>
-Last-Update: 2012-05-05
+Last-Update: Tue, 21 Jul 2015 08:51:28 +0200
 
-Index: pixelmed-20101204/webstart/DicomImageViewer.jnlp
-===================================================================
---- pixelmed-20101204.orig/webstart/DicomImageViewer.jnlp	2009-03-20 16:41:18.000000000 +0100
-+++ pixelmed-20101204/webstart/DicomImageViewer.jnlp	2011-01-16 19:11:18.000000000 +0100
+--- a/webstart/DicomImageViewer.jnlp
++++ b/webstart/DicomImageViewer.jnlp
 @@ -18,14 +18,14 @@
    <resources>
-     <j2se version="1.5+" java-vm-args="-Xmx512m"/>
+     <j2se version="1.7+" java-vm-args="-Xmx512m"/>
      <jar href="pixelmed.jar"/>
 -	<jar href="commons-codec-1.3.jar" download="eager"/>
 +	<jar href="commons-codec.jar" download="eager"/>
  	<jar href="hsqldb.jar" download="lazy"/>
  	<jar href="jmdns.jar" download="lazy"/>
--	<jar href="excalibur-bzip2-1.0.jar" download="lazy"/>
+-	<jar href="commons-compress-1.9.jar" download="lazy"/>
 -	<jar href="vecmath1.2-1.14.jar" download="lazy"/>
-+	<!--jar href="excalibur-bzip2-1.0.jar" download="lazy"/-->
++	<jar href="commons-compress.jar" download="lazy"/>
 +	<jar href="vecmath.jar" download="lazy"/>
  	<!--extension href="http://download.java.net/media/jai-imageio/webstart/release/jai-imageio-1.1.jnlp"/-->
  	<!--extension href="http://download.java.net/media/jai-imageio/webstart/early-access/jai-imageio-1.1.jnlp"/-->
 -	<extension href="http://www.dclunie.com/pixelmed/software/webstart/jai-imageio-1.1_DAC.jnlp"/>
-+	<!--extension href="http://www.dclunie.com/pixelmed/software/webstart/jai-imageio-1.1_DAC.jnlp"/-->
++	<!--<extension href="http://www.dclunie.com/pixelmed/software/webstart/jai-imageio-1.1_DAC.jnlp"/>-->
    </resources>
    <application-desc main-class="com.pixelmed.display.DicomImageViewer"/>
  </jnlp> 

Modified: trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch	2015-07-21 06:54:10 UTC (rev 19684)
+++ trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch	2015-07-21 14:02:13 UTC (rev 19685)
@@ -1,15 +1,16 @@
 Description: Fix path according to debian layout
 Forwarded: not-needed
 Author: Mathieu Malaterre <malat at debian.org>
-Last-Update: 2012-05-05
+Last-Update: Tue, 21 Jul 2015 08:51:28 +0200
 
-Index: pixelmed-20101204/DicomImageViewer.sh
-===================================================================
---- pixelmed-20101204.orig/DicomImageViewer.sh	2010-02-27 20:08:41.000000000 +0100
-+++ pixelmed-20101204/DicomImageViewer.sh	2011-01-16 19:11:05.000000000 +0100
-@@ -4,4 +4,4 @@
+--- a/DicomImageViewer.sh
++++ b/DicomImageViewer.sh
+@@ -2,6 +2,6 @@
  
- PIXELMEDDIR=.
+ dicomfile="$*"
  
--java -Xmx512m -Xms512m -cp "${PIXELMEDDIR}/pixelmed.jar:${PIXELMEDDIR}/lib/additional/hsqldb.jar:${PIXELMEDDIR}/lib/additional/excalibur-bzip2-1.0.jar:${PIXELMEDDIR}/lib/additional/vecmath1.2-1.14.jar:${PIXELMEDDIR}/lib/additional/jmdns.jar:${PIXELMEDDIR}/lib/additional/commons-codec-1.3.jar:${PIXELMEDDIR}/lib/additional/jai_imageio.jar" com.pixelmed.display.DicomImageViewer "${dicomfile}"
-+java -Xmx512m -Xms512m -cp "/usr/share/java/pixelmed.jar:/usr/share/java/hsqldb.jar:/usr/share/java/vecmath.jar:/usr/share/java/jmdns.jar:/usr/share/java/commons-codec.jar:/usr/share/java/jai_imageio.jar" com.pixelmed.display.DicomImageViewer "${dicomfile}"
+-PIXELMEDDIR=.
++PIXELMEDDIR=/usr/share/java
+ 
+-java -Xmx512m -Xms512m -cp "${PIXELMEDDIR}/pixelmed.jar:${PIXELMEDDIR}/lib/additional/hsqldb.jar:${PIXELMEDDIR}/lib/additional/commons-compress-1.9.jar:${PIXELMEDDIR}/lib/additional/vecmath1.2-1.14.jar:${PIXELMEDDIR}/lib/additional/jmdns.jar:${PIXELMEDDIR}/lib/additional/commons-codec-1.3.jar:${PIXELMEDDIR}/lib/additional/jai_imageio.jar" com.pixelmed.display.DicomImageViewer "${dicomfile}"
++java -Xmx512m -Xms512m -cp "${PIXELMEDDIR}/pixelmed.jar:${PIXELMEDDIR}/hsqldb.jar:${PIXELMEDDIR}/commons-compress.jar:${PIXELMEDDIR}/vecmath.jar:${PIXELMEDDIR}/jmdns.jar:${PIXELMEDDIR}/commons-codec.jar:${PIXELMEDDIR}/jai_imageio.jar" com.pixelmed.display.DicomImageViewer "${dicomfile}"

Modified: trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch	2015-07-21 06:54:10 UTC (rev 19684)
+++ trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch	2015-07-21 14:02:13 UTC (rev 19685)
@@ -3,11 +3,9 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20120218/ECGViewer.sh
-===================================================================
---- pixelmed-20120218.orig/ECGViewer.sh	2012-03-05 11:05:51.000000000 +0100
-+++ pixelmed-20120218/ECGViewer.sh	2012-03-05 11:10:04.000000000 +0100
-@@ -4,4 +4,4 @@
+--- a/ECGViewer.sh
++++ b/ECGViewer.sh
+@@ -4,4 +4,4 @@ dicomfile="$*"
  
  PIXELMEDDIR=.

More information about the debian-med-commit mailing list