[med-svn] r19686 - trunk/packages/pixelmed/trunk/debian/patches
Andreas Tille
tille at moszumanska.debian.org
Tue Jul 21 14:19:00 UTC 2015
Author: tille
Date: 2015-07-21 14:18:59 +0000 (Tue, 21 Jul 2015)
New Revision: 19686
Modified:
trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch
trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
Log:
Refresh more patches
Modified: trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch 2015-07-21 14:02:13 UTC (rev 19685)
+++ trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch 2015-07-21 14:18:59 UTC (rev 19686)
@@ -3,11 +3,9 @@
Author: Mathieu Malaterre <malat at debian.org>
Last-Update: 2012-05-05
-Index: pixelmed-20140326/Makefile
-===================================================================
---- pixelmed-20140326.orig/Makefile 2014-04-09 22:30:13.269215181 +0200
-+++ pixelmed-20140326/Makefile 2014-04-09 22:30:16.009215268 +0200
-@@ -360,7 +360,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -363,7 +363,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-07-21 14:02:13 UTC (rev 19685)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2015-07-21 14:18:59 UTC (rev 19686)
@@ -1,49 +1,89 @@
Description: This patch fix compilation for ftp class
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Last-Update: 2012-05-05
+Last-Update: Tue, 21 Jul 2015 16:17:52 +0200
-Index: pixelmed-20140326/Makefile
-===================================================================
---- pixelmed-20140326.orig/Makefile 2014-04-09 22:30:11.197215114 +0200
-+++ pixelmed-20140326/Makefile 2014-04-09 22:30:13.269215181 +0200
-@@ -183,7 +183,7 @@
- WEBSTARTFILES = \
+--- a/Makefile
++++ b/Makefile
+@@ -189,7 +189,7 @@ WEBSTARTFILES = \
webstart/pixelmed.jar \
+ webstart/pixelmed_codec.jar \
webstart/commons-codec-1.3.jar \
- webstart/commons-net-ftp-2.0.jar \
+ webstart/commons-net2.jar \
webstart/hsqldb.jar \
webstart/jmdns.jar \
- webstart/excalibur-bzip2-1.0.jar \
-@@ -223,7 +223,7 @@
+ webstart/commons-compress-1.9.jar \
+@@ -228,14 +228,14 @@ SOURCERELEASEFILES = \
+ ${SUBDIRS}
DEPENDENCYRELEASEFILESWITHOUTREADME = \
- lib/additional/commons-codec-1.3.jar \
+- lib/additional/commons-codec-1.3.jar \
- lib/additional/commons-net-ftp-2.0.jar \
+- lib/additional/commons-compress-1.9.jar \
++ lib/additional/commons-codec.jar \
+ lib/additional/commons-net2.jar \
- lib/additional/excalibur-bzip2-1.0.jar \
++ lib/additional/commons-compress.jar \
lib/additional/hsqldb.jar \
- lib/additional/vecmath1.2-1.14.jar \
-@@ -247,7 +247,7 @@
+- lib/additional/vecmath1.2-1.14.jar \
++ lib/additional/vecmath.jar \
+ lib/additional/jmdns.jar \
+ lib/additional/aiviewer.jar \
+- lib/junit/junit-4.8.1.jar \
++ lib/junit/junit4.jar \
+ LICENSES
+ DEPENDENCYRELEASEFILES = \
+@@ -243,19 +243,19 @@ DEPENDENCYRELEASEFILES = \
+ README
+
+ DICOMCLEANERDEPENDENCYRELEASEFILES = \
+- lib/additional/commons-codec-1.3.jar \
+- lib/additional/commons-compress-1.9.jar \
++ lib/additional/commons-codec.jar \
++ lib/additional/commons-compress.jar \
+ lib/additional/hsqldb.jar \
+- lib/additional/vecmath1.2-1.14.jar \
++ lib/additional/vecmath.jar \
+ lib/additional/jmdns.jar \
+ LICENSES/hsqldb_lic.txt
+
DOSEUTILITYDEPENDENCYRELEASEFILES = \
- lib/additional/commons-codec-1.3.jar \
+- lib/additional/commons-codec-1.3.jar \
- lib/additional/commons-net-ftp-2.0.jar \
+- lib/additional/commons-compress-1.9.jar \
++ lib/additional/commons-codec.jar \
+ lib/additional/commons-net2.jar \
- lib/additional/excalibur-bzip2-1.0.jar \
++ lib/additional/commons-compress.jar \
lib/additional/hsqldb.jar \
- lib/additional/vecmath1.2-1.14.jar \
-@@ -314,7 +314,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-net2.jar \
- DoseUtility.app/Contents/Resources/Java/jmdns.jar \
- DoseUtility.app/Contents/Resources/Java/jai_imageio.jar \
+- lib/additional/vecmath1.2-1.14.jar \
++ lib/additional/vecmath.jar \
+ lib/additional/jmdns.jar \
+ LICENSES/hsqldb_lic.txt
+
+@@ -320,9 +320,9 @@ MACAPPRELEASEFILES = \
DoseUtility.app/Contents/Resources/DoseUtility.icns \
-@@ -472,7 +472,7 @@
+ DoseUtility.app/Contents/Java/pixelmed.jar \
+ DoseUtility.app/Contents/Java/hsqldb.jar \
+- DoseUtility.app/Contents/Java/commons-compress-1.9.jar \
+- DoseUtility.app/Contents/Java/commons-codec-1.3.jar \
+- DoseUtility.app/Contents/Java/commons-net-ftp-2.0.jar \
++ DoseUtility.app/Contents/Java/commons-compress.jar \
++ DoseUtility.app/Contents/Java/commons-codec.jar \
++ DoseUtility.app/Contents/Java/commons-net2.jar \
+ DoseUtility.app/Contents/Java/jmdns.jar \
+ DoseUtility.app/Contents/Java/jai_imageio.jar
+
+@@ -332,7 +332,7 @@ MACAPPECGRELEASEFILES = \
+ ECGViewer.app/Contents/PkgInfo \
+ ECGViewer.app/Contents/Resources/GenericJavaApp.icns \
+ ECGViewer.app/Contents/Java/pixelmed.jar \
+- ECGViewer.app/Contents/Java/commons-codec-1.3.jar
++ ECGViewer.app/Contents/Java/commons-codec.jar
+
+ TESTSCPECGRESULTFILES = \
+ testresults/scpecg
+@@ -480,7 +480,7 @@ webstart/commons-codec-1.3.jar: lib/addi
cp $< $@
jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
@@ -52,47 +92,47 @@
mkdir -p webstart
cp $< $@
jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
-@@ -727,7 +727,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-net2.jar: lib/additional/commons-net2.jar
- mkdir -p DoseUtility.app/Contents/Resources/Java
- cp $< $@
-
-@@ -928,7 +928,7 @@
+@@ -715,9 +715,9 @@ DicomCleaner.app/Contents/MacOS/JavaAppL
+ DoseUtility_app: \
+ DoseUtility.app/Contents/Java/pixelmed.jar \
+ DoseUtility.app/Contents/Java/hsqldb.jar \
+- DoseUtility.app/Contents/Java/commons-compress-1.9.jar \
+- DoseUtility.app/Contents/Java/commons-codec-1.3.jar \
+- DoseUtility.app/Contents/Java/commons-net-ftp-2.0.jar \
++ DoseUtility.app/Contents/Java/commons-compress.jar \
++ DoseUtility.app/Contents/Java/commons-codec.jar \
++ DoseUtility.app/Contents/Java/commons-net2.jar \
+ 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:
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-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/ \
+- -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 \
+ -link http://docs.oracle.com/javase/7/docs/api/ \
-link http://jpedal.org/javadoc/ \
-link http://www.hsqldb.org/doc/src/ \
-Index: pixelmed-20140326/Makefile.common.mk
-===================================================================
---- pixelmed-20140326.orig/Makefile.common.mk 2014-04-09 22:30:04.469214899 +0200
-+++ pixelmed-20140326/Makefile.common.mk 2014-04-09 22:30:13.269215181 +0200
-@@ -35,7 +35,7 @@
+--- a/Makefile.common.mk
++++ b/Makefile.common.mk
+@@ -40,7 +40,7 @@ DISPLAYADDITIONALJARS = ${DICOMADDITIONA
DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar
-FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net-ftp-2.0.jar
+FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net2.jar
- VIEWERADDITIONALJARS = ${DISPLAYADDITIONALJARS}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/jmdns.jar
+ NETWORKADDITIONALJARS = ${PATHTOADDITIONAL}/jmdns.jar
-Index: pixelmed-20140326/webstart/DoseUtility.jnlp
-===================================================================
---- pixelmed-20140326.orig/webstart/DoseUtility.jnlp 2011-12-08 14:10:09.000000000 +0100
-+++ pixelmed-20140326/webstart/DoseUtility.jnlp 2014-04-09 22:30:13.269215181 +0200
+--- a/webstart/DoseUtility.jnlp
++++ b/webstart/DoseUtility.jnlp
@@ -19,7 +19,7 @@
- <j2se version="1.5+" java-vm-args="-Xmx768m -Xss2m"/>
+ <j2se version="1.7+" java-vm-args="-Xmx768m -Xss2m"/>
<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-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"/>
+ <jar href="commons-compress-1.9.jar" download="lazy"/>
Modified: trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch 2015-07-21 14:02:13 UTC (rev 19685)
+++ trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch 2015-07-21 14:18:59 UTC (rev 19686)
@@ -2,11 +2,9 @@
No such things as Arial Unicode MS or Bitstream Cybertif on debian OS
Author: Mathieu Malaterre <malat at debian.org>
-Index: pixelmed-20130220/com/pixelmed/display/ApplicationFrame.java
-===================================================================
---- pixelmed-20130220.orig/com/pixelmed/display/ApplicationFrame.java 2013-02-21 00:07:48.000000000 +0100
-+++ pixelmed-20130220/com/pixelmed/display/ApplicationFrame.java 2013-04-24 15:25:07.590587331 +0200
-@@ -302,7 +302,10 @@
+--- a/com/pixelmed/display/ApplicationFrame.java
++++ b/com/pixelmed/display/ApplicationFrame.java
+@@ -302,7 +302,10 @@ public class ApplicationFrame extends JF
if (font == null || !font.getFamily().equals("Arial Unicode MS")) {
font = new Font("Bitstream Cyberbit",Font.PLAIN,13);
if (font == null || !font.getFamily().equals("Bitstream Cyberbit")) {
Modified: trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2015-07-21 14:02:13 UTC (rev 19685)
+++ trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2015-07-21 14:18:59 UTC (rev 19686)
@@ -3,11 +3,9 @@
Author: Mathieu Malaterre <malat at debian.org>
Last-Update: 2012-05-05
-Index: pixelmed-20140326/Makefile
-===================================================================
---- pixelmed-20140326.orig/Makefile 2014-03-25 00:49:40.000000000 +0100
-+++ pixelmed-20140326/Makefile 2014-04-09 22:30:11.197215114 +0200
-@@ -366,7 +366,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -369,7 +369,7 @@ pixelmed.jar:
com/pixelmed/event/*.class \
com/pixelmed/display/event/*.class \
com/pixelmed/geometry/*.class \
More information about the debian-med-commit
mailing list