[med-svn] r19687 - trunk/packages/pixelmed/trunk/debian/patches
Andreas Tille
tille at moszumanska.debian.org
Tue Jul 21 15:55:35 UTC 2015
Author: tille
Date: 2015-07-21 15:55:34 +0000 (Tue, 21 Jul 2015)
New Revision: 19687
Modified:
trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch
trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch
trunk/packages/pixelmed/trunk/debian/patches/series
Log:
Refresh more patches
Modified: trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch 2015-07-21 14:18:59 UTC (rev 19686)
+++ trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch 2015-07-21 15:55:34 UTC (rev 19687)
@@ -1,11 +1,10 @@
Description: Allow off-line JNLP apps
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: Tue, 21 Jul 2015 17:54:43 +0200
-Index: pixelmed-20130220/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
-===================================================================
---- pixelmed-20130220.orig/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp 2013-04-25 14:05:03.969668634 +0200
-+++ pixelmed-20130220/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp 2013-04-25 14:05:35.489668277 +0200
+--- a/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
++++ b/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
@@ -21,7 +21,7 @@
<jar href="pixelmed.jar"/>
<!--extension href="http://download.java.net/media/jai-imageio/webstart/release/jai-imageio-1.1.jnlp"/-->
@@ -15,50 +14,46 @@
</resources>
<application-desc main-class="com.pixelmed.convert.ConvertAmicasJPEG2000FilesetToDicom"/>
</jnlp>
-Index: pixelmed-20130220/webstart/DicomCleaner.jnlp
-===================================================================
---- pixelmed-20130220.orig/webstart/DicomCleaner.jnlp 2013-04-25 14:05:45.489668164 +0200
-+++ pixelmed-20130220/webstart/DicomCleaner.jnlp 2013-04-25 14:06:14.417667840 +0200
-@@ -18,14 +18,14 @@
- <resources>
- <j2se version="1.5+" java-vm-args="-Xmx768m"/>
+--- a/webstart/DicomCleaner.jnlp
++++ b/webstart/DicomCleaner.jnlp
+@@ -19,14 +19,14 @@
+ <j2se version="1.7+" java-vm-args="-Xmx768m"/>
<jar href="pixelmed.jar"/>
+ <jar href="pixelmed_codec.jar"/>
- <jar href="commons-codec-1.3.jar" download="eager"/>
-- <jar href="hsqldb.jar" download="eager"/>
-- <jar href="jmdns.jar" download="eager"/>
-+ <jar href="commons-codec.jar" download="lazy"/>
-+ <jar href="hsqldb.jar" download="lazy"/>
-+ <jar href="jmdns.jar" download="lazy"/>
- <jar href="excalibur-bzip2-1.0.jar" download="lazy"/>
++ <jar href="commons-codec.jar" download="eager"/>
+ <jar href="hsqldb.jar" download="eager"/>
+ <jar href="jmdns.jar" download="eager"/>
+- <jar href="commons-compress-1.9.jar" download="lazy"/>
- <jar href="vecmath1.2-1.14.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.DicomCleaner"/>
</jnlp>
-Index: pixelmed-20130220/webstart/DoseUtility.jnlp
-===================================================================
---- pixelmed-20130220.orig/webstart/DoseUtility.jnlp 2013-04-25 14:06:48.673667450 +0200
-+++ pixelmed-20130220/webstart/DoseUtility.jnlp 2013-04-25 14:07:10.069667216 +0200
+--- a/webstart/DoseUtility.jnlp
++++ b/webstart/DoseUtility.jnlp
@@ -18,15 +18,15 @@
<resources>
- <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-codec.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"/>
- <jar href="vecmath1.2-1.14.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.apps.DoseUtility"/>
</jnlp>
Modified: trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch 2015-07-21 14:18:59 UTC (rev 19686)
+++ trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch 2015-07-21 15:55:34 UTC (rev 19687)
@@ -1,5 +1,6 @@
Description: fix doc generation
Author: Mathieu Malaterre <malat at debian.org>
+Comment: This patch somehow went into commons-net-ftp.patch (Andreas Tille <tille at debian.org>)
Index: pixelmed-20140326/Makefile
===================================================================
Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series 2015-07-21 14:18:59 UTC (rev 19686)
+++ trunk/packages/pixelmed/trunk/debian/patches/series 2015-07-21 15:55:34 UTC (rev 19687)
@@ -7,7 +7,7 @@
commons-net-ftp.patch
addmanifest.patch
fixfonts.patch
-fixdoc.patch
+# fixdoc.patch ... somehow went into commons-net-ftp.patch
fix_jnlp.patch
add_usage.patch
removetest.patch
More information about the debian-med-commit
mailing list