Author: malat Date: 2013-04-25 12:34:21 +0000 (Thu, 25 Apr 2013) New Revision: 13416
Added: trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch trunk/packages/pixelmed/trunk/debian/pixelmed trunk/packages/pixelmed/trunk/debian/pixelmed-www.postinst trunk/packages/pixelmed/trunk/debian/pixelmed-www.prerm Modified: trunk/packages/pixelmed/trunk/debian/changelog trunk/packages/pixelmed/trunk/debian/control trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch trunk/packages/pixelmed/trunk/debian/patches/series Log: Upload JNLP apps Modified: trunk/packages/pixelmed/trunk/debian/changelog =================================================================== --- trunk/packages/pixelmed/trunk/debian/changelog 2013-04-25 10:22:23 UTC (rev 13415) +++ trunk/packages/pixelmed/trunk/debian/changelog 2013-04-25 12:34:21 UTC (rev 13416) @@ -1,9 +1,10 @@ -pixelmed (20130220-1) unstable; urgency=low +pixelmed (20130220-1) experimental; urgency=low * New upstream * Add -doc package for documentation + * Add -www package to provide JNLP apps - -- Mathieu Malaterre <ma...@debian.org> Thu, 25 Apr 2013 10:41:55 +0200 + -- Mathieu Malaterre <ma...@debian.org> Thu, 25 Apr 2013 14:32:48 +0200 pixelmed (20120508-1) unstable; urgency=low Modified: trunk/packages/pixelmed/trunk/debian/control =================================================================== --- trunk/packages/pixelmed/trunk/debian/control 2013-04-25 10:22:23 UTC (rev 13415) +++ trunk/packages/pixelmed/trunk/debian/control 2013-04-25 12:34:21 UTC (rev 13416) @@ -9,7 +9,7 @@ junit4, libcommons-codec-java, libcommons-net2-java (>= 2.0), - libhsqldb-java, + libhsqldb-java (>= 1.8.0), libjmdns-java (>= 3.4), libvecmath-java Standards-Version: 3.9.4 @@ -40,3 +40,15 @@ spectra, and DICOM object validation. . This is the documentation package for pixelmed-java + +Package: pixelmed-www +Architecture: all +Section: web +Depends: ${misc:Depends}, pixelmed-java (= ${binary:Version}) +Description: DICOM implementation containing Image Viewer and a ECG Viewer - jnlp + This is a stand-alone DICOM toolkit that implements code for reading + and creating DICOM data, DICOM network and file support, a database of + DICOM objects, support for display of directories, images, reports and + spectra, and DICOM object validation. + . + This is the web package. Provide JNLP applications Added: trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch (rev 0) +++ trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch 2013-04-25 12:34:21 UTC (rev 13416) @@ -0,0 +1,60 @@ +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 +@@ -21,7 +21,7 @@ + <jar href="pixelmed.jar"/> + <!--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"/--> + </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"/> + <jar href="pixelmed.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="vecmath1.2-1.14.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"/--> + </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 +@@ -18,15 +18,15 @@ + <resources> + <j2se version="1.5+" 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="vecmath1.2-1.14.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"/--> + </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 2013-04-25 10:22:23 UTC (rev 13415) +++ trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch 2013-04-25 12:34:21 UTC (rev 13416) @@ -1,3 +1,6 @@ +Description: fix doc generation +Author: Mathieu Malaterre <ma...@debian.org> + Index: pixelmed-20130220/Makefile =================================================================== --- pixelmed-20130220.orig/Makefile 2013-04-25 10:47:20.705802199 +0200 Added: trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch (rev 0) +++ trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch 2013-04-25 12:34:21 UTC (rev 13416) @@ -0,0 +1,17 @@ +Description: Remove test that need X running +Forwarded: not-needed +Author: Mathieu Malaterre <ma...@debian.org> + +Index: pixelmed-20130220/com/pixelmed/test/Makefile +=================================================================== +--- pixelmed-20130220.orig/com/pixelmed/test/Makefile 2013-04-25 13:22:24.721697448 +0200 ++++ pixelmed-20130220/com/pixelmed/test/Makefile 2013-04-25 13:22:29.445697393 +0200 +@@ -102,7 +102,7 @@ + + alltests: testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testcompositecontext testremoveid testattributelist \ + testcontentitem testcodingscheme testcharset testanatomy testgeometry testdicomdir testuuid testbase64 testdates testsequence \ +- testthread testmultiframe ++ testmultiframe + + testmultiframe: ${OBJS} + java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestMultiFrameImageFactory_AllTests Modified: trunk/packages/pixelmed/trunk/debian/patches/series =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/series 2013-04-25 10:22:23 UTC (rev 13415) +++ trunk/packages/pixelmed/trunk/debian/patches/series 2013-04-25 12:34:21 UTC (rev 13416) @@ -11,3 +11,5 @@ target_java_1.7.patch fixdoc.patch fix_xslt.patch +remove_x_test.patch +fix_jnlp.patch Added: trunk/packages/pixelmed/trunk/debian/pixelmed =================================================================== --- trunk/packages/pixelmed/trunk/debian/pixelmed (rev 0) +++ trunk/packages/pixelmed/trunk/debian/pixelmed 2013-04-25 12:34:21 UTC (rev 13416) @@ -0,0 +1,2 @@ +# http://webapps-common.alioth.debian.org/draft/html/ch-httpd.html#s-httpd-location +Alias /pixelmed /usr/share/pixelmed Added: trunk/packages/pixelmed/trunk/debian/pixelmed-www.postinst =================================================================== --- trunk/packages/pixelmed/trunk/debian/pixelmed-www.postinst (rev 0) +++ trunk/packages/pixelmed/trunk/debian/pixelmed-www.postinst 2013-04-25 12:34:21 UTC (rev 13416) @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -e /etc/apache2/apache2.conf ]; then + a2ensite pixelmed || true +fi + +exit 0 Added: trunk/packages/pixelmed/trunk/debian/pixelmed-www.prerm =================================================================== --- trunk/packages/pixelmed/trunk/debian/pixelmed-www.prerm (rev 0) +++ trunk/packages/pixelmed/trunk/debian/pixelmed-www.prerm 2013-04-25 12:34:21 UTC (rev 13416) @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -e /etc/apache2/apache2.conf ]; then + a2dissite pixelmed || true +fi + +exit 0 _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit