[med-svn] r20201 - in trunk/packages/pixelmed/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Tue Oct 6 20:02:48 UTC 2015
Author: tille
Date: 2015-10-06 20:02:48 +0000 (Tue, 06 Oct 2015)
New Revision: 20201
Added:
trunk/packages/pixelmed/trunk/debian/patches/imageio.patch
trunk/packages/pixelmed/trunk/debian/patches/no_Xdiags_verbose.patch
trunk/packages/pixelmed/trunk/debian/patches/set_java_home.patch
Modified:
trunk/packages/pixelmed/trunk/debian/changelog
trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch
trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
trunk/packages/pixelmed/trunk/debian/patches/illegalchar.patch
trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
trunk/packages/pixelmed/trunk/debian/patches/series
Log:
Try to build latest version but failed
Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog 2015-10-06 14:53:02 UTC (rev 20200)
+++ trunk/packages/pixelmed/trunk/debian/changelog 2015-10-06 20:02:48 UTC (rev 20201)
@@ -1,11 +1,13 @@
-pixelmed (20150512-1) UNRELEASED; urgency=medium
+pixelmed (20150917-1) UNRELEASED; urgency=medium
* New upstream version
* Added myself to uploaders
* cme fix dpkg-control
* Add Build-Depends: libcommons-compress-java
+ * Replace libcommons-net2-java by libcommons-net-java
+ Closes: #800762
- -- Andreas Tille <tille at debian.org> Tue, 21 Jul 2015 08:51:28 +0200
+ -- Andreas Tille <tille at debian.org> Tue, 06 Oct 2015 21:43:11 +0200
pixelmed (20140816-1) unstable; urgency=low
Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch 2015-10-06 14:53:02 UTC (rev 20200)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch 2015-10-06 20:02:48 UTC (rev 20201)
@@ -43,14 +43,3 @@
DISPLAYADDITIONALJARS = ${DICOMADDITIONALJARS}:${JIIOADDITIONALJARS}
---- 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
-
- 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)
-
- 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/add_usage.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch 2015-10-06 14:53:02 UTC (rev 20200)
+++ trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch 2015-10-06 20:02:48 UTC (rev 20201)
@@ -19,8 +19,8 @@
String password = arg.length >= 7 ? arg[6] : null;
--- a/com/pixelmed/validate/DicomSRValidator.java
+++ b/com/pixelmed/validate/DicomSRValidator.java
-@@ -289,6 +289,11 @@ public class DicomSRValidator {
- * @param arg optionally -describe, optionally -donotmatchcase, then the name of the file containing the DICOM SR instance to be validated
+@@ -344,6 +344,11 @@ public class DicomSRValidator {
+ * @param arg optionally -describe, -donotmatchcase, -checkambiguoustemplate, -checkcontentitemorder, -checktemplateid, then the name of the file containing the DICOM SR instance to be validated
*/
public static void main(String arg[]) {
+ if (arg.length < 1) {
Modified: trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch 2015-10-06 14:53:02 UTC (rev 20200)
+++ trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch 2015-10-06 20:02:48 UTC (rev 20201)
@@ -5,7 +5,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -363,7 +363,8 @@ pixelmed.jar:
+@@ -366,7 +366,8 @@ pixelmed.jar:
(cd com/pixelmed/apps; make all)
(cd com/pixelmed/test; make all)
date >BUILDDATE
Modified: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2015-10-06 14:53:02 UTC (rev 20200)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2015-10-06 20:02:48 UTC (rev 20201)
@@ -5,16 +5,24 @@
--- a/Makefile
+++ b/Makefile
-@@ -189,7 +189,7 @@ WEBSTARTFILES = \
+@@ -188,12 +188,12 @@ WEBSTARTJAIFILES = \
+ WEBSTARTFILES = \
webstart/pixelmed.jar \
webstart/pixelmed_codec.jar \
- webstart/commons-codec-1.3.jar \
+- webstart/commons-codec-1.3.jar \
- webstart/commons-net-ftp-2.0.jar \
++ webstart/commons-codec.jar \
+ webstart/commons-net2.jar \
webstart/hsqldb.jar \
webstart/jmdns.jar \
- webstart/commons-compress-1.9.jar \
-@@ -228,14 +228,14 @@ SOURCERELEASEFILES = \
+- webstart/commons-compress-1.9.jar \
+- webstart/vecmath1.2-1.14.jar \
++ webstart/commons-compress.jar \
++ webstart/vecmath.jar \
+ webstart/icons/ConvertAmicasJPEG2000FilesetToDicom.png \
+ webstart/icons/DicomCleaner.png \
+ webstart/icons/DicomImageBlackout.png \
+@@ -228,16 +228,16 @@ SOURCERELEASEFILES = \
${SUBDIRS}
DEPENDENCYRELEASEFILESWITHOUTREADME = \
@@ -29,15 +37,17 @@
+ lib/additional/vecmath.jar \
lib/additional/jmdns.jar \
lib/additional/aiviewer.jar \
+ lib/additional/javax.json-1.0.4.jar \
+ lib/additional/javax.json-api-1.0.jar \
- lib/junit/junit-4.8.1.jar \
+ lib/junit/junit4.jar \
LICENSES
DEPENDENCYRELEASEFILES = \
-@@ -243,19 +243,19 @@ DEPENDENCYRELEASEFILES = \
- README
+@@ -246,19 +246,19 @@ DEPENDENCYRELEASEFILES = \
DICOMCLEANERDEPENDENCYRELEASEFILES = \
+ lib/additional/pixelmed_codec.jar \
- lib/additional/commons-codec-1.3.jar \
- lib/additional/commons-compress-1.9.jar \
+ lib/additional/commons-codec.jar \
@@ -61,7 +71,30 @@
lib/additional/jmdns.jar \
LICENSES/hsqldb_lic.txt
-@@ -320,9 +320,9 @@ MACAPPRELEASEFILES = \
+@@ -303,17 +303,17 @@ MACAPPRELEASEFILES = \
+ DicomImageViewer.app/Contents/Resources/DicomImageViewer.icns \
+ DicomImageViewer.app/Contents/Java/pixelmed.jar \
+ DicomImageViewer.app/Contents/Java/hsqldb.jar \
+- DicomImageViewer.app/Contents/Java/commons-compress-1.9.jar \
+- DicomImageViewer.app/Contents/Java/vecmath1.2-1.14.jar \
+- DicomImageViewer.app/Contents/Java/commons-codec-1.3.jar \
++ DicomImageViewer.app/Contents/Java/commons-compress.jar \
++ DicomImageViewer.app/Contents/Java/vecmath.jar \
++ DicomImageViewer.app/Contents/Java/commons-codec.jar \
+ DicomImageViewer.app/Contents/Java/jai_imageio.jar \
+ DicomImageViewer.app/Contents/Java/jmdns.jar \
+ DicomCleaner.app/Contents/Info.plist \
+ DicomCleaner.app/Contents/MacOS/JavaAppLauncher \
+ DicomCleaner.app/Contents/PkgInfo \
+ DicomCleaner.app/Contents/Resources/DicomCleaner.icns \
+- DicomCleaner.app/Contents/Java/commons-codec-1.3.jar \
+- DicomCleaner.app/Contents/Java/commons-compress-1.9.jar \
++ DicomCleaner.app/Contents/Java/commons-codec.jar \
++ DicomCleaner.app/Contents/Java/commons-compress.jar \
+ DicomCleaner.app/Contents/Java/hsqldb.jar \
+ DicomCleaner.app/Contents/Java/jmdns.jar \
+ DicomCleaner.app/Contents/Java/pixelmed.jar \
+@@ -323,9 +323,9 @@ MACAPPRELEASEFILES = \
DoseUtility.app/Contents/Resources/DoseUtility.icns \
DoseUtility.app/Contents/Java/pixelmed.jar \
DoseUtility.app/Contents/Java/hsqldb.jar \
@@ -74,7 +107,7 @@
DoseUtility.app/Contents/Java/jmdns.jar \
DoseUtility.app/Contents/Java/jai_imageio.jar
-@@ -332,7 +332,7 @@ MACAPPECGRELEASEFILES = \
+@@ -335,7 +335,7 @@ MACAPPECGRELEASEFILES = \
ECGViewer.app/Contents/PkgInfo \
ECGViewer.app/Contents/Resources/GenericJavaApp.icns \
ECGViewer.app/Contents/Java/pixelmed.jar \
@@ -83,16 +116,112 @@
TESTSCPECGRESULTFILES = \
testresults/scpecg
-@@ -480,7 +480,7 @@ webstart/commons-codec-1.3.jar: lib/addi
+@@ -478,12 +478,12 @@ webstart/pixelmed_codec.jar: lib/additio
cp $< $@
jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
+-webstart/commons-codec-1.3.jar: lib/additional/commons-codec-1.3.jar
++webstart/commons-codec.jar: lib/additional/commons-codec.jar
+ mkdir -p webstart
+ 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-net2.jar
mkdir -p webstart
cp $< $@
jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
-@@ -715,9 +715,9 @@ DicomCleaner.app/Contents/MacOS/JavaAppL
+@@ -498,12 +498,12 @@ webstart/jmdns.jar: lib/additional/jmdns
+ cp $< $@
+ jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
+
+-webstart/commons-compress-1.9.jar: lib/additional/commons-compress-1.9.jar
++webstart/commons-compress.jar: lib/additional/commons-compress.jar
+ mkdir -p webstart
+ cp $< $@
+ jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
+
+-webstart/vecmath1.2-1.14.jar: lib/additional/vecmath1.2-1.14.jar
++webstart/vecmath.jar: lib/additional/vecmath.jar
+ mkdir -p webstart
+ cp $< $@
+ jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
+@@ -600,7 +600,7 @@ macapps: ${MACAPPS}
+
+ ECGViewer_app: \
+ ECGViewer.app/Contents/Java/pixelmed.jar \
+- ECGViewer.app/Contents/Java/commons-codec-1.3.jar \
++ ECGViewer.app/Contents/Java/commons-codec.jar \
+ ECGViewer.app/Contents/MacOS/JavaAppLauncher
+ cp -r ECGViewer.app $${HOME}/Applications/
+
+@@ -608,7 +608,7 @@ ECGViewer.app/Contents/Java/pixelmed.jar
+ mkdir -p ECGViewer.app/Contents/Java
+ cp $< $@
+
+-ECGViewer.app/Contents/Java/commons-codec-1.3.jar: lib/additional/commons-codec-1.3.jar
++ECGViewer.app/Contents/Java/commons-codec.jar: lib/additional/commons-codec.jar
+ mkdir -p ECGViewer.app/Contents/Java
+ cp $< $@
+
+@@ -620,9 +620,9 @@ ECGViewer.app/Contents/MacOS/JavaAppLaun
+ DicomImageViewer_app: \
+ DicomImageViewer.app/Contents/Java/pixelmed.jar \
+ DicomImageViewer.app/Contents/Java/hsqldb.jar \
+- DicomImageViewer.app/Contents/Java/commons-compress-1.9.jar \
+- DicomImageViewer.app/Contents/Java/vecmath1.2-1.14.jar \
+- DicomImageViewer.app/Contents/Java/commons-codec-1.3.jar \
++ DicomImageViewer.app/Contents/Java/commons-compress.jar \
++ DicomImageViewer.app/Contents/Java/vecmath.jar \
++ DicomImageViewer.app/Contents/Java/commons-codec.jar \
+ DicomImageViewer.app/Contents/Java/jai_imageio.jar \
+ DicomImageViewer.app/Contents/Java/jmdns.jar \
+ DicomImageViewer.app/Contents/Resources/DicomImageViewer.icns \
+@@ -637,15 +637,15 @@ DicomImageViewer.app/Contents/Java/hsqld
+ mkdir -p DicomImageViewer.app/Contents/Java
+ cp $< $@
+
+-DicomImageViewer.app/Contents/Java/commons-compress-1.9.jar: lib/additional/commons-compress-1.9.jar
++DicomImageViewer.app/Contents/Java/commons-compress.jar: lib/additional/commons-compress.jar
+ mkdir -p DicomImageViewer.app/Contents/Java
+ cp $< $@
+
+-DicomImageViewer.app/Contents/Java/vecmath1.2-1.14.jar: lib/additional/vecmath1.2-1.14.jar
++DicomImageViewer.app/Contents/Java/vecmath.jar: lib/additional/vecmath.jar
+ mkdir -p DicomImageViewer.app/Contents/Java
+ cp $< $@
+
+-DicomImageViewer.app/Contents/Java/commons-codec-1.3.jar: lib/additional/commons-codec-1.3.jar
++DicomImageViewer.app/Contents/Java/commons-codec.jar: lib/additional/commons-codec.jar
+ mkdir -p DicomImageViewer.app/Contents/Java
+ cp $< $@
+
+@@ -670,8 +670,8 @@ DicomCleaner_app: \
+ DicomCleaner.app/Contents/Java/pixelmed.jar \
+ DicomCleaner.app/Contents/Java/pixelmed_codec.jar \
+ DicomCleaner.app/Contents/Java/hsqldb.jar \
+- DicomCleaner.app/Contents/Java/commons-compress-1.9.jar \
+- DicomCleaner.app/Contents/Java/commons-codec-1.3.jar \
++ DicomCleaner.app/Contents/Java/commons-compress.jar \
++ DicomCleaner.app/Contents/Java/commons-codec.jar \
+ DicomCleaner.app/Contents/Java/jmdns.jar \
+ DicomCleaner.app/Contents/Java/jai_imageio.jar \
+ DicomCleaner.app/Contents/Resources/DicomCleaner.icns \
+@@ -690,11 +690,11 @@ DicomCleaner.app/Contents/Java/hsqldb.ja
+ mkdir -p DicomCleaner.app/Contents/Java
+ cp $< $@
+
+-DicomCleaner.app/Contents/Java/commons-compress-1.9.jar: lib/additional/commons-compress-1.9.jar
++DicomCleaner.app/Contents/Java/commons-compress.jar: lib/additional/commons-compress.jar
+ mkdir -p DicomCleaner.app/Contents/Java
+ cp $< $@
+
+-DicomCleaner.app/Contents/Java/commons-codec-1.3.jar: lib/additional/commons-codec-1.3.jar
++DicomCleaner.app/Contents/Java/commons-codec.jar: lib/additional/commons-codec.jar
+ mkdir -p DicomCleaner.app/Contents/Java
+ cp $< $@
+
+@@ -718,9 +718,9 @@ DicomCleaner.app/Contents/MacOS/JavaAppL
DoseUtility_app: \
DoseUtility.app/Contents/Java/pixelmed.jar \
DoseUtility.app/Contents/Java/hsqldb.jar \
@@ -105,12 +234,36 @@
DoseUtility.app/Contents/Java/jmdns.jar \
DoseUtility.app/Contents/Java/jai_imageio.jar \
DoseUtility.app/Contents/Resources/DoseUtility.icns \
-@@ -941,7 +941,7 @@ windows.lib:
+@@ -735,15 +735,15 @@ DoseUtility.app/Contents/Java/hsqldb.jar
+ mkdir -p DoseUtility.app/Contents/Java
+ cp $< $@
+
+-DoseUtility.app/Contents/Java/commons-compress-1.9.jar: lib/additional/commons-compress-1.9.jar
++DoseUtility.app/Contents/Java/commons-compress.jar: lib/additional/commons-compress.jar
+ mkdir -p DoseUtility.app/Contents/Java
+ cp $< $@
+
+-DoseUtility.app/Contents/Java/commons-codec-1.3.jar: lib/additional/commons-codec-1.3.jar
++DoseUtility.app/Contents/Java/commons-codec.jar: lib/additional/commons-codec.jar
+ mkdir -p DoseUtility.app/Contents/Java
+ cp $< $@
+
+-DoseUtility.app/Contents/Java/commons-net-ftp-2.0.jar: lib/additional/commons-net-ftp-2.0.jar
++DoseUtility.app/Contents/Java/commons-net2.jar: lib/additional/commons-net2.jar
+ mkdir -p DoseUtility.app/Contents/Java
+ cp $< $@
+
+@@ -940,11 +940,11 @@ windows.lib:
+ (cd windows; make lib); \
+ fi
+
+-# used to link to "http://www.junit.org/apidocs/" but this no longer works ... use version-specific "http://javasourcecode.org/html/open-source/junit/junit-4.8.1/" instead
++# used to link to "http://www.junit.org/apidocs/" but this no longer works ... use version-specific "http://javasourcecode.org/html/open-source/junit/junit4/" instead
javadoc:
rm -rf docs/javadoc
javadoc \
-- -classpath .:lib/additional/commons-compress-1.9.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/commons-compress.jar:lib/additional/hsqldb.jar:lib/additional/vecmath.jar:lib/additional/commons-codec.jar:lib/additional/commons-net2.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit4.jar \
+- -classpath .:lib/additional/commons-compress-1.9.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:lib/additional/javax.json-api-1.0.jar \
++ -classpath .:lib/additional/commons-compress.jar:lib/additional/hsqldb.jar:lib/additional/vecmath.jar:lib/additional/commons-codec.jar:lib/additional/commons-net2.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit4.jar:lib/additional/javax.json-api-1.0.jar \
-link http://docs.oracle.com/javase/7/docs/api/ \
-link http://jpedal.org/javadoc/ \
-link http://www.hsqldb.org/doc/src/ \
Modified: trunk/packages/pixelmed/trunk/debian/patches/illegalchar.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/illegalchar.patch 2015-10-06 14:53:02 UTC (rev 20200)
+++ trunk/packages/pixelmed/trunk/debian/patches/illegalchar.patch 2015-10-06 20:02:48 UTC (rev 20201)
@@ -2,11 +2,9 @@
Author: Mathieu Malaterre <malat at debian.org>
Forwarded: no
-Index: pixelmed-20140429/com/pixelmed/test/TestAttributeListReadTerminationStrategy.java
-===================================================================
---- pixelmed-20140429.orig/com/pixelmed/test/TestAttributeListReadTerminationStrategy.java 2014-06-24 21:37:32.000000000 +0200
-+++ pixelmed-20140429/com/pixelmed/test/TestAttributeListReadTerminationStrategy.java 2014-06-24 21:49:42.683528489 +0200
-@@ -246,7 +246,7 @@
+--- a/com/pixelmed/test/TestAttributeListReadTerminationStrategy.java
++++ b/com/pixelmed/test/TestAttributeListReadTerminationStrategy.java
+@@ -246,7 +246,7 @@ public class TestAttributeListReadTermin
s2.addItem(s2list);
}
}
@@ -15,7 +13,7 @@
list.write(testFile);
}
-@@ -264,9 +264,9 @@
+@@ -264,9 +264,9 @@ public class TestAttributeListReadTermin
}
{
Added: trunk/packages/pixelmed/trunk/debian/patches/imageio.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/imageio.patch (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/imageio.patch 2015-10-06 20:02:48 UTC (rev 20201)
@@ -0,0 +1,10 @@
+--- a/com/pixelmed/display/ImageEditUtilities.java
++++ b/com/pixelmed/display/ImageEditUtilities.java
+@@ -26,6 +26,7 @@ import java.io.File;
+ import java.io.FileNotFoundException;
+ import java.io.FileOutputStream;
+ import java.io.IOException;
++import javax.imageio.*;
+
+ import java.util.Iterator;
+ import java.util.Vector;
Modified: trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2015-10-06 14:53:02 UTC (rev 20200)
+++ trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2015-10-06 20:02:48 UTC (rev 20201)
@@ -5,7 +5,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -369,7 +369,7 @@ pixelmed.jar:
+@@ -372,7 +372,7 @@ pixelmed.jar:
com/pixelmed/event/*.class \
com/pixelmed/display/event/*.class \
com/pixelmed/geometry/*.class \
Added: trunk/packages/pixelmed/trunk/debian/patches/no_Xdiags_verbose.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/no_Xdiags_verbose.patch (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/no_Xdiags_verbose.patch 2015-10-06 20:02:48 UTC (rev 20201)
@@ -0,0 +1,26 @@
+Author: Andreas Tille:
+Last-Update: Tue, 06 Oct 2015 21:43:11 +0200
+Description: Avoid unknown option -Xdiags:verbose
+ make[3]: Entering directory '/build/pixelmed-20150917/com/pixelmed/utils'
+ Makefile:36: warning: overriding recipe for target '.java.class'
+ ../../../Makefile.common.mk:64: warning: ignoring old recipe for target '.java.class'
+ export JAVAVERSIONTARGETJARFILE=/usr/lib/jvm/default-java/jre/lib/rt.jar; javac -O -target 1.7 -source 1.7 -bootclasspath ${JAVAVERSIONTARGETJARFILE} -encoding "UTF8" -Xlint: deprecation -XDignore.symbol.file -Xdiags:verbose \
+ -classpath ../../..:/usr/share/java/pixelmed_codec.jar \
+ -sourcepath ../../.. ByteArray.java
+ javac: invalid flag: -Xdiags:verbose
+ Usage: javac <options> <source files>
+ use -help for a list of possible options
+ Makefile:36: recipe for target 'ByteArray.class' failed
+
+
+--- a/Makefile.common.mk
++++ b/Makefile.common.mk
+@@ -58,7 +58,7 @@ JAVACTARGETOPTIONS=-target ${JAVAVERSION
+ .SUFFIXES: .class .java .ico .png
+
+ # -XDignore.symbol.file needed to find "package com.sun.image.codec.jpeg" ("http://stackoverflow.com/questions/1906673/import-com-sun-image-codec-jpeg")
+-JAVACOPTIONS = -O ${JAVACTARGETOPTIONS} -encoding "UTF8" -Xlint:deprecation -XDignore.symbol.file -Xdiags:verbose
++JAVACOPTIONS = -O ${JAVACTARGETOPTIONS} -encoding "UTF8" -Xlint:deprecation -XDignore.symbol.file
+
+ .java.class:
+ export JAVAVERSIONTARGETJARFILE=${JAVA_HOME}/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series 2015-10-06 14:53:02 UTC (rev 20200)
+++ trunk/packages/pixelmed/trunk/debian/patches/series 2015-10-06 20:02:48 UTC (rev 20201)
@@ -12,3 +12,6 @@
add_usage.patch
## removetest.patch ... see whether the test remain failing
illegalchar.patch
+set_java_home.patch
+imageio.patch
+no_Xdiags_verbose.patch
Added: trunk/packages/pixelmed/trunk/debian/patches/set_java_home.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/set_java_home.patch (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/set_java_home.patch 2015-10-06 20:02:48 UTC (rev 20201)
@@ -0,0 +1,44 @@
+--- a/Makefile.common.mk
++++ b/Makefile.common.mk
+@@ -61,7 +61,7 @@ JAVACTARGETOPTIONS=-target ${JAVAVERSION
+ JAVACOPTIONS = -O ${JAVACTARGETOPTIONS} -encoding "UTF8" -Xlint:deprecation -XDignore.symbol.file -Xdiags:verbose
+
+ .java.class:
+- export JAVAVERSIONTARGETJARFILE=`/usr/libexec/java_home -v ${JAVAVERSIONTARGET} | tail -1`/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
++ export JAVAVERSIONTARGETJARFILE=${JAVA_HOME}/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
+ -classpath ${PATHTOROOT}:${DICOMADDITIONALJARS}:${VIEWERADDITIONALJARS}:${FTPADDITIONALJARS}:${JUNITJAR} \
+ -sourcepath ${PATHTOROOT} $<
+
+--- a/com/pixelmed/utils/Makefile
++++ b/com/pixelmed/utils/Makefile
+@@ -33,7 +33,7 @@ include ${PATHTOROOT}/Makefile.common.mk
+
+ # override javac command in Makefile.common.mk to add jars needed for CapabilitiesAvailable
+ .java.class:
+- export JAVAVERSIONTARGETJARFILE=`/usr/libexec/java_home -v 1.7 | tail -1`/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
++ export JAVAVERSIONTARGETJARFILE=${JAVA_HOME}/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
+ -classpath ${PATHTOROOT}:${JPEGBLOCKREDACTIONJAR} \
+ -sourcepath ${PATHTOROOT} $<
+
+--- a/com/pixelmed/display/Makefile
++++ b/com/pixelmed/display/Makefile
+@@ -63,7 +63,7 @@ include ${PATHTOROOT}/Makefile.common.mk
+
+ # override javac command in Makefile.common.mk to add codec to classpath, until folded into main trunk :(
+ .java.class:
+- export JAVAVERSIONTARGETJARFILE=`/usr/libexec/java_home -v 1.7 | tail -1`/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
++ export JAVAVERSIONTARGETJARFILE=${JAVA_HOME}/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
+ -classpath ${PATHTOROOT}:${DISPLAYADDITIONALJARS}:${JPEGBLOCKREDACTIONJAR} \
+ -sourcepath ${PATHTOROOT} $<
+
+--- a/com/pixelmed/apps/Makefile
++++ b/com/pixelmed/apps/Makefile
+@@ -40,7 +40,7 @@ include ${PATHTOROOT}/Makefile.common.mk
+
+ # override javac command in Makefile.common.mk to add codec to classpath, until folded into main trunk :(
+ .java.class:
+- export JAVAVERSIONTARGETJARFILE=`/usr/libexec/java_home -v ${JAVAVERSIONTARGET} | tail -1`/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
++ export JAVAVERSIONTARGETJARFILE=${JAVA_HOME}/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
+ -classpath ${PATHTOROOT}:${DATABASEADDITIONALJARS}:${FTPADDITIONALJARS}:${JPEGBLOCKREDACTIONJAR}:${PATHTOADDITIONAL}/javax.json-api-1.0.jar \
+ -sourcepath ${PATHTOROOT} $<
+
More information about the debian-med-commit
mailing list