[med-svn] r5667 - in trunk/packages/pixelmed/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Sun Jan 16 18:22:40 UTC 2011
Author: malat-guest
Date: 2011-01-16 18:22:30 +0000 (Sun, 16 Jan 2011)
New Revision: 5667
Added:
trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
Modified:
trunk/packages/pixelmed/trunk/debian/changelog
trunk/packages/pixelmed/trunk/debian/control
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
trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
trunk/packages/pixelmed/trunk/debian/patches/series
Log:
Prepare for new upstream. Use quilt to refresh patches.
Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog 2011-01-14 15:41:35 UTC (rev 5666)
+++ trunk/packages/pixelmed/trunk/debian/changelog 2011-01-16 18:22:30 UTC (rev 5667)
@@ -1,3 +1,10 @@
+pixelmed (20101204-2) unstable; urgency=low
+
+ * New upstream
+ * Add dep to libcommons-net-java to resolve org.apache.commons.net.ftp.FTP
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Sun, 16 Jan 2011 18:24:49 +0100
+
pixelmed (20100617-1) unstable; urgency=low
* New upstream
Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control 2011-01-14 15:41:35 UTC (rev 5666)
+++ trunk/packages/pixelmed/trunk/debian/control 2011-01-16 18:22:30 UTC (rev 5667)
@@ -14,7 +14,7 @@
Package: pixelmed-java
Section: java
Architecture: all
-Depends: libhsqldb-java, libvecmath-java, libcommons-codec-java, libbcprov-java, ${java:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime, java-wrappers (>= 0.1.15)
+Depends: libhsqldb-java, libcommons-net-java, libvecmath-java, libcommons-codec-java, libbcprov-java, ${java:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime, java-wrappers (>= 0.1.15)
Suggests: java-virtual-machine
Description: DICOM implementation containing Image Viewer and a ECG Viewer
This is a stand-alone DICOM toolkit that implements code for reading
Modified: trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch 2011-01-14 15:41:35 UTC (rev 5666)
+++ trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch 2011-01-16 18:22:30 UTC (rev 5667)
@@ -1,6 +1,8 @@
---- pixelmed-20091114/com/pixelmed/display/DicomImageViewer.java 2009-06-07 20:26:53.000000000 +0200
-+++ pixelmed-20091114.old/com/pixelmed/display/DicomImageViewer.java 2009-11-20 12:33:46.000000000 +0100
-@@ -61,7 +61,7 @@
+Index: pixelmed-20101204/com/pixelmed/display/DicomImageViewer.java
+===================================================================
+--- pixelmed-20101204.orig/com/pixelmed/display/DicomImageViewer.java 2010-11-27 14:54:13.000000000 +0100
++++ pixelmed-20101204/com/pixelmed/display/DicomImageViewer.java 2011-01-16 19:11:12.000000000 +0100
+@@ -63,7 +63,7 @@
static final char screenSnapShotKeyChar = 'K';
/***/
@@ -9,9 +11,11 @@
// property names ...
---- pixelmed-20091114/com/pixelmed/utils/FileUtilities.java 2008-01-18 23:21:50.000000000 +0100
-+++ pixelmed-20091114.old/com/pixelmed/utils/FileUtilities.java 2009-11-20 14:36:09.000000000 +0100
-@@ -220,7 +220,8 @@
+Index: pixelmed-20101204/com/pixelmed/utils/FileUtilities.java
+===================================================================
+--- pixelmed-20101204.orig/com/pixelmed/utils/FileUtilities.java 2009-12-04 21:37:00.000000000 +0100
++++ pixelmed-20101204/com/pixelmed/utils/FileUtilities.java 2011-01-16 19:11:12.000000000 +0100
+@@ -225,7 +225,8 @@
* @param fileName the file name to make a path to
*/
static public final String makePathToFileInUsersHomeDirectory(String fileName) {
@@ -19,5 +23,5 @@
+ //return System.getProperty("user.home")+System.getProperty("file.separator")+fileName;
+ return fileName;
}
- }
+ /**
Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch 2011-01-14 15:41:35 UTC (rev 5666)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch 2011-01-16 18:22:30 UTC (rev 5667)
@@ -1,7 +1,9 @@
Set include path according to debian layout
---- pixelmed-20091114/com/pixelmed/display/Makefile 2009-06-07 20:13:34.000000000 +0200
-+++ pixelmed-20091114.old/com/pixelmed/display/Makefile 2009-11-17 11:58:43.000000000 +0100
+Index: pixelmed-20101204/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
@@ -212,7 +212,7 @@
com.pixelmed.display.DicomImageViewer ${PATHTOHOME}/Pictures/Medical/NEMA97CD/DICOMDIR
@@ -11,8 +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)
---- pixelmed-20091114/com/pixelmed/geometry/Makefile 2007-07-27 18:43:36.000000000 +0200
-+++ pixelmed-20091114.old/com/pixelmed/geometry/Makefile 2009-11-17 11:58:26.000000000 +0100
+Index: pixelmed-20101204/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
@@ -16,7 +16,7 @@
.SUFFIXES: .class .java
@@ -22,8 +26,10 @@
-sourcepath ${PATHTOROOT} $<
archive:
---- pixelmed-20100617/Makefile.common.mk 2010-05-23 19:55:10.000000000 +0200
-+++ pixelmed-20100617.old/Makefile.common.mk 2010-07-05 20:16:34.000000000 +0200
+Index: pixelmed-20101204/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
@@ -4,9 +4,10 @@
PATHTOHOME = /Users/dclunie
Added: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2011-01-16 18:22:30 UTC (rev 5667)
@@ -0,0 +1,77 @@
+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
+@@ -148,7 +148,7 @@
+ WEBSTARTFILES = \
+ webstart/pixelmed.jar \
+ webstart/commons-codec-1.3.jar \
+- webstart/commons-net-ftp-2.0.jar \
++ webstart/commons-net.jar \
+ webstart/hsqldb.jar \
+ webstart/jmdns.jar \
+ webstart/excalibur-bzip2-1.0.jar \
+@@ -184,7 +184,7 @@
+
+ DEPENDENCYRELEASEFILESWITHOUTREADME = \
+ lib/additional/commons-codec-1.3.jar \
+- lib/additional/commons-net-ftp-2.0.jar \
++ lib/additional/commons-net.jar \
+ lib/additional/excalibur-bzip2-1.0.jar \
+ lib/additional/hsqldb.jar \
+ lib/additional/vecmath1.2-1.14.jar \
+@@ -208,7 +208,7 @@
+
+ DOSEUTILITYDEPENDENCYRELEASEFILES = \
+ lib/additional/commons-codec-1.3.jar \
+- lib/additional/commons-net-ftp-2.0.jar \
++ lib/additional/commons-net.jar \
+ lib/additional/excalibur-bzip2-1.0.jar \
+ lib/additional/hsqldb.jar \
+ lib/additional/vecmath1.2-1.14.jar \
+@@ -275,7 +275,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/DicomCleaner.icns \
+@@ -423,7 +423,7 @@
+ cp $< $@
+ 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
+ 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 @@
+ mkdir -p DoseUtility.app/Contents/Resources/Java
+ 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
+ mkdir -p DoseUtility.app/Contents/Resources/Java
+ cp $< $@
+
+@@ -790,7 +790,7 @@
+ javadoc:
+ 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 \
+ -link http://download.oracle.com/javase/1.5.0/docs/api/ \
+ -link http://jpedal.org/javadoc/ \
+ -link http://www.hsqldb.org/doc/src/ \
Modified: trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch 2011-01-14 15:41:35 UTC (rev 5666)
+++ trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch 2011-01-16 18:22:30 UTC (rev 5667)
@@ -1,7 +1,9 @@
Fix jnlp path
---- pixelmed-20091114/webstart/DicomImageViewer.jnlp 2009-03-20 16:41:18.000000000 +0100
-+++ pixelmed-20091114.old/webstart/DicomImageViewer.jnlp 2009-11-21 22:20:28.000000000 +0100
+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
@@ -18,14 +18,14 @@
<resources>
<j2se version="1.5+" java-vm-args="-Xmx512m"/>
@@ -21,4 +23,3 @@
</resources>
<application-desc main-class="com.pixelmed.display.DicomImageViewer"/>
</jnlp>
-Common subdirectories: pixelmed-20091114/webstart/images and pixelmed-20091114.old/webstart/images
Modified: trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch 2011-01-14 15:41:35 UTC (rev 5666)
+++ trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch 2011-01-16 18:22:30 UTC (rev 5667)
@@ -1,8 +1,9 @@
Fix path according to debian layout
-diff -ru pixelmed-20100430/DicomImageViewer.sh copy/DicomImageViewer.sh
---- pixelmed-20100430/DicomImageViewer.sh 2010-02-27 20:08:41.000000000 +0100
-+++ copy/DicomImageViewer.sh 2010-05-03 18:00:48.000000000 +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 @@
PIXELMEDDIR=.
Modified: trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch 2011-01-14 15:41:35 UTC (rev 5666)
+++ trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch 2011-01-16 18:22:30 UTC (rev 5667)
@@ -1,7 +1,9 @@
Fix path according to debian layout
---- pixelmed-20091114/ECGViewer.sh 2009-11-20 11:51:17.000000000 +0100
-+++ pixelmed-20091114.old/ECGViewer.sh 2009-11-20 11:51:43.000000000 +0100
+Index: pixelmed-20101204/ECGViewer.sh
+===================================================================
+--- pixelmed-20101204.orig/ECGViewer.sh 2006-03-12 13:19:18.000000000 +0100
++++ pixelmed-20101204/ECGViewer.sh 2011-01-16 19:11:11.000000000 +0100
@@ -1,3 +1,3 @@
#!/bin/sh
Modified: trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2011-01-14 15:41:35 UTC (rev 5666)
+++ trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2011-01-16 18:22:30 UTC (rev 5667)
@@ -1,8 +1,10 @@
*.dat files were removed
---- pixelmed-20091114/Makefile 2009-12-18 16:54:38.000000000 +0100
-+++ pixelmed-20091114.old/Makefile 2009-12-18 16:54:25.000000000 +0100
-@@ -243,7 +243,7 @@
+Index: pixelmed-20101204/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 @@
com/pixelmed/event/*.class \
com/pixelmed/display/event/*.class \
com/pixelmed/geometry/*.class \
Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series 2011-01-14 15:41:35 UTC (rev 5666)
+++ trunk/packages/pixelmed/trunk/debian/patches/series 2011-01-16 18:22:30 UTC (rev 5667)
@@ -4,3 +4,4 @@
DicomImageViewer.properties.patch
dicomimageviewer.jnlp.patch
makefile.patch
+commons-net-ftp.patch
More information about the debian-med-commit
mailing list