[med-svn] r13806 - trunk/packages/pixelmed/trunk/debian

Mathieu Malaterre malat at alioth.debian.org
Mon Jun 3 07:31:20 UTC 2013 

Author: malat
Date: 2013-06-03 07:31:19 +0000 (Mon, 03 Jun 2013)
New Revision: 13806

Added:
   trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom
   trunk/packages/pixelmed/trunk/debian/DicomCleaner
   trunk/packages/pixelmed/trunk/debian/DicomImageBlackout
   trunk/packages/pixelmed/trunk/debian/DicomImageViewer
   trunk/packages/pixelmed/trunk/debian/DicomSRValidator
   trunk/packages/pixelmed/trunk/debian/DoseUtility
   trunk/packages/pixelmed/trunk/debian/MediaImporter
   trunk/packages/pixelmed/trunk/debian/VerificationSOPClassSCU
   trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend
   trunk/packages/pixelmed/trunk/debian/pixelmed-apps.install
   trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.install
Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/control
   trunk/packages/pixelmed/trunk/debian/ecgviewer
   trunk/packages/pixelmed/trunk/debian/pixelmed-java.install
   trunk/packages/pixelmed/trunk/debian/pixelmed-www.install
   trunk/packages/pixelmed/trunk/debian/rules
Log:
Rework pixelmed package

Added: trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom
===================================================================
--- trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,6 @@
+#!/bin/sh
+# generated by jnlp2script.sh
+
+# http://www.dclunie.com/pixelmed/software/webstart
+
+java -cp /usr/share/java/pixelmed.jar -Xmx128m com.pixelmed.convert.ConvertAmicasJPEG2000FilesetToDicom


Property changes on: trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/packages/pixelmed/trunk/debian/DicomCleaner
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomCleaner	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/DicomCleaner	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,6 @@
+#!/bin/sh
+# generated by jnlp2script.sh
+
+# http://www.dclunie.com/pixelmed/software/webstart
+
+java -cp /usr/share/java/pixelmed.jar -Xmx768m com.pixelmed.display.DicomCleaner


Property changes on: trunk/packages/pixelmed/trunk/debian/DicomCleaner
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/packages/pixelmed/trunk/debian/DicomImageBlackout
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomImageBlackout	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/DicomImageBlackout	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,6 @@
+#!/bin/sh
+# generated by jnlp2script.sh
+
+# http://www.dclunie.com/pixelmed/software/webstart
+
+java -cp /usr/share/java/pixelmed.jar -Xmx512m com.pixelmed.display.DicomImageBlackout


Property changes on: trunk/packages/pixelmed/trunk/debian/DicomImageBlackout
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/packages/pixelmed/trunk/debian/DicomImageViewer
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomImageViewer	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/DicomImageViewer	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,6 @@
+#!/bin/sh
+# generated by jnlp2script.sh
+
+# http://www.dclunie.com/pixelmed/software/webstart
+
+java -cp /usr/share/java/pixelmed.jar -Xmx512m com.pixelmed.display.DicomImageViewer


Property changes on: trunk/packages/pixelmed/trunk/debian/DicomImageViewer
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/packages/pixelmed/trunk/debian/DicomSRValidator
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomSRValidator	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/DicomSRValidator	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# manually generated
+
+java -cp /usr/share/java/pixelmed.jar com.pixelmed.validate.DicomSRValidator "$@"


Property changes on: trunk/packages/pixelmed/trunk/debian/DicomSRValidator
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/packages/pixelmed/trunk/debian/DoseUtility
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DoseUtility	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/DoseUtility	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,6 @@
+#!/bin/sh
+# generated by jnlp2script.sh
+
+# http://www.dclunie.com/pixelmed/software/webstart
+
+java -cp /usr/share/java/pixelmed.jar -Xmx768m -Xss2m com.pixelmed.apps.DoseUtility


Property changes on: trunk/packages/pixelmed/trunk/debian/DoseUtility
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/packages/pixelmed/trunk/debian/MediaImporter
===================================================================
--- trunk/packages/pixelmed/trunk/debian/MediaImporter	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/MediaImporter	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Terminal=false
+Version=20130220
+Name=MediaImporter
+GenericName=MediaImporter Application
+Comment=A simple media checker that searches for DICOMDIR and/or DICOM files.
+TryExec=
+Exec=
+Categories=Education;DataVisualization;ImageProcessing;MedicalSoftware
+Icon=
+MimeType=application/x-;

Added: trunk/packages/pixelmed/trunk/debian/VerificationSOPClassSCU
===================================================================
--- trunk/packages/pixelmed/trunk/debian/VerificationSOPClassSCU	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/VerificationSOPClassSCU	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# manually generated
+
+java -cp /usr/share/java/pixelmed.jar com.pixelmed.network.VerificationSOPClassSCU "$@"


Property changes on: trunk/packages/pixelmed/trunk/debian/VerificationSOPClassSCU
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend
===================================================================
--- trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,6 @@
+#!/bin/sh
+# generated by jnlp2script.sh
+
+# http://www.dclunie.com/pixelmed/software/webstart
+
+java -cp /usr/share/java/pixelmed.jar -Xmx128m com.pixelmed.apps.WatchFolderAndSend


Property changes on: trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2013-06-03 07:14:17 UTC (rev 13805)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2013-06-03 07:31:19 UTC (rev 13806)
@@ -1,3 +1,11 @@
+pixelmed (20130426-1) UNRELEASED; urgency=low
+
+  * New upstream
+  * Provides webapps as command line utils. Closes: #657354
+  * Add demos command line tools. Closes: #664087
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 03 Jun 2013 09:12:59 +0200
+
 pixelmed (20130220-1) experimental; urgency=low
 
   * New upstream

Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control	2013-06-03 07:14:17 UTC (rev 13805)
+++ trunk/packages/pixelmed/trunk/debian/control	2013-06-03 07:31:19 UTC (rev 13806)
@@ -17,11 +17,13 @@
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/pixelmed/trunk/
 Homepage: http://www.pixelmed.com
 
-Package: pixelmed-java
+Package: libpixelmed-java
 Architecture: all
 Section: java
 Depends: ${java:Depends}, ${misc:Depends}
 Suggests: libjai-imageio-core-java
+Conflicts: pixelmed-java
+Replaces: pixelmed-java
 Description: DICOM implementation containing Image Viewer and a ECG Viewer
  This is a stand-alone DICOM toolkit that implements code for reading
  and creating DICOM data, DICOM network and file support, a database of
@@ -32,7 +34,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: pixelmed-java
+Suggests: libpixelmed-java
 Description: DICOM implementation containing Image Viewer and a ECG Viewer - doc
  This is a stand-alone DICOM toolkit that implements code for reading
  and creating DICOM data, DICOM network and file support, a database of
@@ -41,14 +43,38 @@
  .
  This is the documentation package for pixelmed-java
 
+Package: pixelmed-apps
+Architecture: all
+Section: utils
+Depends: ${misc:Depends}, default-jre-headless, libpixelmed-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.
+ .
+ Provide command line applications for using pixelmed
+
+Package: pixelmed-webstart-apps
+Architecture: all
+Section: utils
+Depends: ${misc:Depends}, libpixelmed-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.
+ .
+ Provide JNLP applications as command line apps
+
 Package: pixelmed-www
 Architecture: all
 Section: web
-Depends: ${misc:Depends}, pixelmed-java (= ${binary:Version})
+Depends: ${misc:Depends}, pixelmed-webstart-apps (= ${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
+ This is the web package. Depends on JNLP applications, provides HTML pages

Modified: trunk/packages/pixelmed/trunk/debian/ecgviewer
===================================================================
--- trunk/packages/pixelmed/trunk/debian/ecgviewer	2013-06-03 07:14:17 UTC (rev 13805)
+++ trunk/packages/pixelmed/trunk/debian/ecgviewer	2013-06-03 07:31:19 UTC (rev 13806)
@@ -10,11 +10,10 @@
 . /usr/lib/java-wrappers/java-wrappers.sh
 
 # We prefer to use openjdk or Sun's java if available
-find_java_runtime openjdk sun  || find_java_runtime 
+find_java_runtime openjdk sun || find_java_runtime 
 
 find_jars pixelmed commons-codec
 
 #java -Xmx512m -Xms512m -cp
 #java -cp "/usr/share/java/pixelmed.jar:/usr/share/java/commons-codec.jar" com.pixelmed.displaywave.ECGViewer
 run_java com.pixelmed.displaywave.ECGViewer "$@"
-

Added: trunk/packages/pixelmed/trunk/debian/pixelmed-apps.install
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-apps.install	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-apps.install	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,8 @@
+# command line tool
+debian/DicomSRValidator         usr/bin
+debian/VerificationSOPClassSCU  usr/bin
+# GUI
+.com.pixelmed.display.DicomImageViewer.properties etc/pixelmed
+debian/dicomimageviewer usr/bin
+debian/doseutility      usr/bin
+debian/ecgviewer        usr/bin

Modified: trunk/packages/pixelmed/trunk/debian/pixelmed-java.install
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java.install	2013-06-03 07:14:17 UTC (rev 13805)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java.install	2013-06-03 07:31:19 UTC (rev 13806)
@@ -1,4 +0,0 @@
-.com.pixelmed.display.DicomImageViewer.properties etc/pixelmed
-debian/dicomimageviewer usr/bin
-debian/doseutility usr/bin
-debian/ecgviewer usr/bin

Added: trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.install
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.install	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.install	2013-06-03 07:31:19 UTC (rev 13806)
@@ -0,0 +1,10 @@
+webstart/*.jnlp usr/share/pixelmed
+icons           usr/share/pixelmed
+# shell scripts wrappers:
+debian/DicomImageBlackout
+debian/MediaImporter
+debian/WatchFolderAndSend
+debian/DicomImageViewer
+debian/ConvertAmicasJPEG2000FilesetToDicom
+debian/DicomCleaner
+debian/DoseUtility

Modified: trunk/packages/pixelmed/trunk/debian/pixelmed-www.install
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-www.install	2013-06-03 07:14:17 UTC (rev 13805)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-www.install	2013-06-03 07:31:19 UTC (rev 13806)
@@ -1,5 +1,3 @@
 webstart/*.html usr/share/pixelmed
-webstart/*.jnlp usr/share/pixelmed
 webstart/images usr/share/pixelmed
-icons           usr/share/pixelmed
 debian/pixelmed etc/apache2/sites-available

Modified: trunk/packages/pixelmed/trunk/debian/rules
===================================================================
--- trunk/packages/pixelmed/trunk/debian/rules	2013-06-03 07:14:17 UTC (rev 13805)
+++ trunk/packages/pixelmed/trunk/debian/rules	2013-06-03 07:31:19 UTC (rev 13806)
@@ -30,12 +30,16 @@
 	# doc package:
 	rm -rf docs
 
-debian/DoseUtility.desktop: webstart/DoseUtility.jnlp debian/jnlp2script.xsl
-	xsltproc --stringparam pixelmed_version $(VERSION) -o $@ debian/jnlp2desktop.xsl webstart/DoseUtility.jnlp
-
-debian/DoseUtility: webstart/DoseUtility.jnlp debian/jnlp2script.xsl
-	xsltproc --stringparam pixelmed_version $(VERSION) -o $@ debian/jnlp2script.xsl webstart/DoseUtility.jnlp
+#debian/%.desktop: webstart/%.jnlp debian/jnlp2script.xsl
+debian/%: webstart/%.jnlp debian/jnlp2script.xsl
+	# create .desktop file:
+	xsltproc --stringparam pixelmed_version $(VERSION) -o $@ debian/jnlp2desktop.xsl $<
+	# script wrapper:
+	xsltproc --stringparam pixelmed_version $(VERSION) -o $@ debian/jnlp2script.xsl $<
 	chmod +x $@
 
+pixelmed_webapps: debian/DicomImageBlackout debian/MediaImporter debian/WatchFolderAndSend debian/DicomImageViewer debian/ConvertAmicasJPEG2000FilesetToDicom debian/DicomCleaner debian/DoseUtility
+	echo "all shell script wrappers done"
+
 get-orig-source:
 	./debian/get-orig-source

More information about the debian-med-commit mailing list