[med-svn] r13812 - in trunk/packages/pixelmed/trunk/debian: . patches

Mathieu Malaterre malat at alioth.debian.org
Mon Jun 3 08:57:12 UTC 2013 

Author: malat
Date: 2013-06-03 08:57:12 +0000 (Mon, 03 Jun 2013)
New Revision: 13812

Added:
   trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom.desktop
   trunk/packages/pixelmed/trunk/debian/DicomCleaner.desktop
   trunk/packages/pixelmed/trunk/debian/DicomImageBlackout.desktop
   trunk/packages/pixelmed/trunk/debian/DicomImageViewer.desktop
   trunk/packages/pixelmed/trunk/debian/DoseUtility.desktop
   trunk/packages/pixelmed/trunk/debian/ImageToDicom
   trunk/packages/pixelmed/trunk/debian/MediaImporter.desktop
   trunk/packages/pixelmed/trunk/debian/NIfTI1ToDicom
   trunk/packages/pixelmed/trunk/debian/NRRDToDicom
   trunk/packages/pixelmed/trunk/debian/PDFToDicomImage
   trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend.desktop
   trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.doc-base
   trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.docs
   trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.javadoc
   trunk/packages/pixelmed/trunk/debian/libpixelmed-java.jlibs
   trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch
   trunk/packages/pixelmed/trunk/debian/pixelmed-apps.manpages
   trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.lintian-overrides
Removed:
   trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.doc-base
   trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.docs
   trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.javadoc
   trunk/packages/pixelmed/trunk/debian/pixelmed-java.jlibs
   trunk/packages/pixelmed/trunk/debian/pixelmed-java.manpages
Modified:
   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/DoseUtility
   trunk/packages/pixelmed/trunk/debian/MediaImporter
   trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/control
   trunk/packages/pixelmed/trunk/debian/jnlp2desktop.xsl
   trunk/packages/pixelmed/trunk/debian/jnlp2script.xsl
   trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
   trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
   trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch
   trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch
   trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
   trunk/packages/pixelmed/trunk/debian/patches/series
   trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch
   trunk/packages/pixelmed/trunk/debian/pixelmed-apps.install
   trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.install
   trunk/packages/pixelmed/trunk/debian/rules
Log:
Prepare new upload of pixelmed

Modified: trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom
===================================================================
--- trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom	2013-06-03 08:57:12 UTC (rev 13812)
@@ -3,4 +3,4 @@
 
 # http://www.dclunie.com/pixelmed/software/webstart
 
-java -cp /usr/share/java/pixelmed.jar -Xmx128m com.pixelmed.convert.ConvertAmicasJPEG2000FilesetToDicom
+java -cp /usr/share/java/pixelmed.jar -Xmx128m com.pixelmed.convert.ConvertAmicasJPEG2000FilesetToDicom "$@"

Added: trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom.desktop
===================================================================
--- trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom.desktop	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/ConvertAmicasJPEG2000FilesetToDicom.desktop	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Terminal=false
+StartupNotify=true
+Version=20130426
+Name=ConvertAmicasJPEG2000FilesetToDicom
+Exec=/usr/bin/ConvertAmicasJPEG2000FilesetToDicom
+GenericName=ConvertAmicasJPEG2000FilesetToDicom Application
+Comment=Convert Amicas JPEG2000 Fileset to Dicom.
+Icon=/usr/share/pixelmed/icons/ConvertAmicasJPEG2000FilesetToDicom.png
+Categories=Science;DataVisualization;ImageProcessing;MedicalSoftware

Modified: trunk/packages/pixelmed/trunk/debian/DicomCleaner
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomCleaner	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/DicomCleaner	2013-06-03 08:57:12 UTC (rev 13812)
@@ -3,4 +3,4 @@
 
 # http://www.dclunie.com/pixelmed/software/webstart
 
-java -cp /usr/share/java/pixelmed.jar -Xmx768m com.pixelmed.display.DicomCleaner
+java -cp /usr/share/java/pixelmed.jar -Xmx768m com.pixelmed.display.DicomCleaner "$@"

Added: trunk/packages/pixelmed/trunk/debian/DicomCleaner.desktop
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomCleaner.desktop	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/DicomCleaner.desktop	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Terminal=false
+StartupNotify=true
+Version=20130426
+Name=DicomCleaner
+Exec=/usr/bin/DicomCleaner
+GenericName=DicomCleaner Application
+Comment=A simple application to query, retrieve, import, de-identify and remap UIDs and send DICOM instances.
+Icon=/usr/share/pixelmed/icons/DicomCleaner.png
+Categories=Science;DataVisualization;ImageProcessing;MedicalSoftware

Modified: trunk/packages/pixelmed/trunk/debian/DicomImageBlackout
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomImageBlackout	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/DicomImageBlackout	2013-06-03 08:57:12 UTC (rev 13812)
@@ -3,4 +3,4 @@
 
 # http://www.dclunie.com/pixelmed/software/webstart
 
-java -cp /usr/share/java/pixelmed.jar -Xmx512m com.pixelmed.display.DicomImageBlackout
+java -cp /usr/share/java/pixelmed.jar -Xmx512m com.pixelmed.display.DicomImageBlackout "$@"

Added: trunk/packages/pixelmed/trunk/debian/DicomImageBlackout.desktop
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomImageBlackout.desktop	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/DicomImageBlackout.desktop	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Terminal=false
+StartupNotify=true
+Version=20130426
+Name=DicomImageBlackout
+Exec=/usr/bin/DicomImageBlackout
+GenericName=DicomImageBlackout Application
+Comment=A simple DICOM image blackout tool.
+Icon=/usr/share/pixelmed/icons/DicomImageBlackout.png
+Categories=Science;DataVisualization;ImageProcessing;MedicalSoftware

Modified: trunk/packages/pixelmed/trunk/debian/DicomImageViewer
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomImageViewer	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/DicomImageViewer	2013-06-03 08:57:12 UTC (rev 13812)
@@ -3,4 +3,4 @@
 
 # http://www.dclunie.com/pixelmed/software/webstart
 
-java -cp /usr/share/java/pixelmed.jar -Xmx512m com.pixelmed.display.DicomImageViewer
+java -cp /usr/share/java/pixelmed.jar -Xmx512m com.pixelmed.display.DicomImageViewer "$@"

Added: trunk/packages/pixelmed/trunk/debian/DicomImageViewer.desktop
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DicomImageViewer.desktop	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/DicomImageViewer.desktop	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Terminal=false
+StartupNotify=true
+Version=20130426
+Name=DicomImageViewer
+Exec=/usr/bin/DicomImageViewer
+GenericName=DicomImageViewer Application
+Comment=A simple DICOM image and spectroscopy viewer.
+Icon=/usr/share/pixelmed/icons/DicomImageViewer.png
+Categories=Science;DataVisualization;ImageProcessing;MedicalSoftware

Modified: trunk/packages/pixelmed/trunk/debian/DoseUtility
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DoseUtility	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/DoseUtility	2013-06-03 08:57:12 UTC (rev 13812)
@@ -3,4 +3,4 @@
 
 # http://www.dclunie.com/pixelmed/software/webstart
 
-java -cp /usr/share/java/pixelmed.jar -Xmx768m -Xss2m com.pixelmed.apps.DoseUtility
+java -cp /usr/share/java/pixelmed.jar -Xmx768m -Xss2m com.pixelmed.apps.DoseUtility "$@"

Added: trunk/packages/pixelmed/trunk/debian/DoseUtility.desktop
===================================================================
--- trunk/packages/pixelmed/trunk/debian/DoseUtility.desktop	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/DoseUtility.desktop	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Terminal=false
+StartupNotify=true
+Version=20130426
+Name=DoseUtility
+Exec=/usr/bin/DoseUtility
+GenericName=Dose Utility Application
+Comment=A simple application to query, retrieve, import, and extract and report radiation dose information.
+Icon=/usr/share/pixelmed/icons/DoseUtility.png
+Categories=Science;DataVisualization;ImageProcessing;MedicalSoftware

Added: trunk/packages/pixelmed/trunk/debian/ImageToDicom
===================================================================
--- trunk/packages/pixelmed/trunk/debian/ImageToDicom	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/ImageToDicom	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# manually generated
+
+java -cp /usr/share/java/pixelmed.jar com.pixelmed.dicom.ImageToDicom "$@"


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

Modified: trunk/packages/pixelmed/trunk/debian/MediaImporter
===================================================================
--- trunk/packages/pixelmed/trunk/debian/MediaImporter	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/MediaImporter	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,12 +1,6 @@
-[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-;
+#!/bin/sh
+# generated by jnlp2script.sh
+
+# http://www.dclunie.com/pixelmed/software/webstart
+
+java -cp /usr/share/java/pixelmed.jar  com.pixelmed.dicom.MediaImporter "$@"

Added: trunk/packages/pixelmed/trunk/debian/MediaImporter.desktop
===================================================================
--- trunk/packages/pixelmed/trunk/debian/MediaImporter.desktop	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/MediaImporter.desktop	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Terminal=false
+StartupNotify=true
+Version=20130426
+Name=MediaImporter
+Exec=/usr/bin/MediaImporter
+GenericName=MediaImporter Application
+Comment=A simple media checker that searches for DICOMDIR and/or DICOM files.
+Icon=/usr/share/pixelmed/icons/MediaImporter.png
+Categories=Science;DataVisualization;ImageProcessing;MedicalSoftware

Added: trunk/packages/pixelmed/trunk/debian/NIfTI1ToDicom
===================================================================
--- trunk/packages/pixelmed/trunk/debian/NIfTI1ToDicom	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/NIfTI1ToDicom	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# manually generated
+
+java -cp /usr/share/java/pixelmed.jar com.pixelmed.convert.NIfTI1ToDicom "$@"


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

Added: trunk/packages/pixelmed/trunk/debian/NRRDToDicom
===================================================================
--- trunk/packages/pixelmed/trunk/debian/NRRDToDicom	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/NRRDToDicom	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# manually generated
+
+java -cp /usr/share/java/pixelmed.jar com.pixelmed.convert.NRRDToDicom "$@"


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

Added: trunk/packages/pixelmed/trunk/debian/PDFToDicomImage
===================================================================
--- trunk/packages/pixelmed/trunk/debian/PDFToDicomImage	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/PDFToDicomImage	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# manually generated
+
+java -cp /usr/share/java/pixelmed.jar com.pixelmed.dicom.PDFToDicomImage "$@"


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

Modified: trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend
===================================================================
--- trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend	2013-06-03 08:57:12 UTC (rev 13812)
@@ -3,4 +3,4 @@
 
 # http://www.dclunie.com/pixelmed/software/webstart
 
-java -cp /usr/share/java/pixelmed.jar -Xmx128m com.pixelmed.apps.WatchFolderAndSend
+java -cp /usr/share/java/pixelmed.jar -Xmx128m com.pixelmed.apps.WatchFolderAndSend "$@"

Added: trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend.desktop
===================================================================
--- trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend.desktop	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/WatchFolderAndSend.desktop	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Terminal=false
+StartupNotify=true
+Version=20130426
+Name=WatchFolderAndSend
+Exec=/usr/bin/WatchFolderAndSend
+GenericName=WatchFolderAndSend Application
+Comment=WatchFolderAndSend Application.
+Icon=/usr/share/pixelmed/icons/WatchFolderAndSend.png
+Categories=Science;DataVisualization;ImageProcessing;MedicalSoftware

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,10 +1,11 @@
-pixelmed (20130426-1) UNRELEASED; urgency=low
+pixelmed (20130426-1) unstable; urgency=low
 
   * New upstream
   * Provides webapps as command line utils. Closes: #657354
-  * Add demos command line tools. Closes: #664087
+  * Add command line tools. Closes: #664087
+  * FTBFS with Java7 (uses internal Java API). Closes: #678383
 
- -- Mathieu Malaterre <malat at debian.org>  Mon, 03 Jun 2013 09:12:59 +0200
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 03 Jun 2013 09:33:37 +0200
 
 pixelmed (20130220-1) experimental; urgency=low
 

Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/control	2013-06-03 08:57:12 UTC (rev 13812)
@@ -21,7 +21,7 @@
 Architecture: all
 Section: java
 Depends: ${java:Depends}, ${misc:Depends}
-Suggests: libjai-imageio-core-java
+Suggests: libjai-imageio-core-java, libpixelmed-java-doc
 Conflicts: pixelmed-java
 Replaces: pixelmed-java
 Description: DICOM implementation containing Image Viewer and a ECG Viewer
@@ -30,10 +30,10 @@
  DICOM objects, support for display of directories, images, reports and
  spectra, and DICOM object validation.
 
-Package: pixelmed-java-doc
+Package: libpixelmed-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, doc-base
 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
@@ -41,12 +41,14 @@
  DICOM objects, support for display of directories, images, reports and
  spectra, and DICOM object validation.
  .
- This is the documentation package for pixelmed-java
+ This is the documentation package for libpixelmed-java
 
 Package: pixelmed-apps
 Architecture: all
 Section: utils
 Depends: ${misc:Depends}, default-jre-headless, libpixelmed-java (= ${binary:Version})
+Conflicts: pixelmed-java
+Replaces: pixelmed-java
 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

Modified: trunk/packages/pixelmed/trunk/debian/jnlp2desktop.xsl
===================================================================
--- trunk/packages/pixelmed/trunk/debian/jnlp2desktop.xsl	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/jnlp2desktop.xsl	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright (c) 2013 Mathieu Malaterre <malat at debian.org>
+
+ XSLT scripts to convert an input JNLP file into an output .desktop file
+
+Ref:
+http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
+http://standards.freedesktop.org/menu-spec/latest/apa.html
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:output method="text" indent="no" omit-xml-declaration="yes" encoding="utf-8"/>
@@ -11,6 +17,10 @@
     <xsl:value-of select="normalize-space(.)"/>
     <xsl:text>
 </xsl:text>
+    <xsl:text>Exec=/usr/bin/</xsl:text>
+    <xsl:value-of select="normalize-space(.)"/>
+    <xsl:text>
+</xsl:text>
   </xsl:template>
   <xsl:template match="description[@kind='short']">
     <xsl:text>Comment=</xsl:text>
@@ -18,6 +28,12 @@
     <xsl:text>
 </xsl:text>
   </xsl:template>
+  <xsl:template match="icon">
+    <xsl:text>Icon=/usr/share/pixelmed/</xsl:text>
+    <xsl:value-of select="normalize-space(@href)"/>
+    <xsl:text>
+</xsl:text>
+  </xsl:template>
   <xsl:template match="description">
     <xsl:text>GenericName=</xsl:text>
     <xsl:value-of select="normalize-space(.)"/>
@@ -29,19 +45,21 @@
   </xsl:template>
   <xsl:template match="jnlp">
     <xsl:text>[Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Terminal=false
+StartupNotify=true
 Version=</xsl:text>
 <xsl:value-of select="$pixelmed_version"/>
 <xsl:text>
 </xsl:text>
     <xsl:apply-templates/>
-<xsl:text>TryExec=
-Exec=
-Categories=Education;DataVisualization;ImageProcessing;MedicalSoftware
-Icon=
+<xsl:text>Categories=Science;DataVisualization;ImageProcessing;MedicalSoftware
+</xsl:text>
+<!--
+TryExec=
 MimeType=application/x-;
-</xsl:text>
+-->
   </xsl:template>
   <xsl:template match="*|@*">
   </xsl:template>

Modified: trunk/packages/pixelmed/trunk/debian/jnlp2script.xsl
===================================================================
--- trunk/packages/pixelmed/trunk/debian/jnlp2script.xsl	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/jnlp2script.xsl	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright (c) 2013 Mathieu Malaterre <malat at debian.org>
+
+ XSLT script to convert an input JNLP file into an output script wrapper (launcher)
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:output method="text" indent="no" omit-xml-declaration="yes" encoding="utf-8"/>
@@ -20,7 +22,7 @@
     <xsl:value-of select="resources/j2se/@java-vm-args"/>
 <xsl:text> </xsl:text>
     <xsl:value-of select="application-desc/@main-class"/>
-<xsl:text>
+<xsl:text> "$@"
 </xsl:text>
   </xsl:template>
 </xsl:stylesheet>

Copied: trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.doc-base (from rev 13806, trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.doc-base)
===================================================================
--- trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.doc-base	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.doc-base	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,9 @@
+Document: libpixelmed-java-doc
+Title: API JavaDoc for pixelmed-java
+Author: David Clunie
+Abstract: This the API JavaDoc for pixelmed-java
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libpixelmed-java-doc/index.html
+Files: /usr/share/doc/libpixelmed-java-doc/*.html

Copied: trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.docs (from rev 13806, trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.docs)
===================================================================
--- trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.docs	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.docs	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1 @@
+docs/javadoc/*

Copied: trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.javadoc (from rev 13806, trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.javadoc)
===================================================================
--- trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.javadoc	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/libpixelmed-java-doc.javadoc	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1 @@
+com.pixelmed

Copied: trunk/packages/pixelmed/trunk/debian/libpixelmed-java.jlibs (from rev 13806, trunk/packages/pixelmed/trunk/debian/pixelmed-java.jlibs)
===================================================================
--- trunk/packages/pixelmed/trunk/debian/libpixelmed-java.jlibs	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/libpixelmed-java.jlibs	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1 @@
+pixelmed.jar

Added: trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,37 @@
+Description: Add Usage
+ This proves usefull when generating man page (help2man)
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: pixelmed-20130426/com/pixelmed/network/VerificationSOPClassSCU.java
+===================================================================
+--- pixelmed-20130426.orig/com/pixelmed/network/VerificationSOPClassSCU.java	2013-06-03 10:32:16.861206687 +0200
++++ pixelmed-20130426/com/pixelmed/network/VerificationSOPClassSCU.java	2013-06-03 10:35:33.357204475 +0200
+@@ -148,6 +148,11 @@
+ 	 * @param	arg	array of four to seven strings - their hostname, their port, their AE Title, our AE Title, and optionally a string flag valued SECURE or NONSECURE, an optional username and an optional password
+ 	 */
+ 	public static void main(String arg[]) {
++    if (arg.length <= 4) {
++      System.err.println("Error: Incorrect number of arguments");
++      System.err.println("Usage: VerificationSOPClassSCU hostname port ae_title called_ae_title [SECURE|NONSECURE] [username] [password]");
++      System.exit(1);
++    }
+ 		boolean secure = arg.length >= 5 && arg[4].toUpperCase(java.util.Locale.US).equals("SECURE");
+ 		String username = arg.length >= 6 ? arg[5] : null;
+ 		String password = arg.length >= 7 ? arg[6] : null;
+Index: pixelmed-20130426/com/pixelmed/validate/DicomSRValidator.java
+===================================================================
+--- pixelmed-20130426.orig/com/pixelmed/validate/DicomSRValidator.java	2013-06-03 10:35:57.509204203 +0200
++++ pixelmed-20130426/com/pixelmed/validate/DicomSRValidator.java	2013-06-03 10:36:38.605203740 +0200
+@@ -236,6 +236,11 @@
+ 	 * @param	arg	the name of the file containing the DICOM SR instance to be validated
+ 	 */
+ 	public static void main(String arg[]) {
++    if (arg.length < 1) {
++      System.err.println("Error: Incorrect number of arguments");
++      System.err.println("Usage: DicomSRValidator dicom_sr_filename");
++      System.exit(1);
++    }
+ 		try {
+ 			DicomSRValidator validator = new DicomSRValidator();
+ 			System.out.print(validator.validate(arg[0]));

Modified: trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch	2013-06-03 08:57:12 UTC (rev 13812)
@@ -3,11 +3,11 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20110717/Makefile
+Index: pixelmed-20130426/Makefile
 ===================================================================
---- pixelmed-20110717.orig/Makefile	2011-08-19 18:28:45.000000000 +0200
-+++ pixelmed-20110717/Makefile	2011-08-19 18:29:08.000000000 +0200
-@@ -340,7 +340,8 @@
+--- pixelmed-20130426.orig/Makefile	2013-06-03 09:31:41.821247614 +0200
++++ pixelmed-20130426/Makefile	2013-06-03 09:31:46.057247566 +0200
+@@ -345,7 +345,8 @@
  	(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	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2013-06-03 08:57:12 UTC (rev 13812)
@@ -3,11 +3,11 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20130220/Makefile
+Index: pixelmed-20130426/Makefile
 ===================================================================
---- pixelmed-20130220.orig/Makefile	2013-04-24 15:25:01.182587405 +0200
-+++ pixelmed-20130220/Makefile	2013-04-24 15:25:02.030587394 +0200
-@@ -165,7 +165,7 @@
+--- pixelmed-20130426.orig/Makefile	2013-06-03 09:31:38.105247656 +0200
++++ pixelmed-20130426/Makefile	2013-06-03 09:31:41.821247614 +0200
+@@ -168,7 +168,7 @@
  WEBSTARTFILES = \
  	webstart/pixelmed.jar \
  	webstart/commons-codec-1.3.jar \
@@ -16,7 +16,7 @@
  	webstart/hsqldb.jar \
  	webstart/jmdns.jar \
  	webstart/excalibur-bzip2-1.0.jar \
-@@ -203,7 +203,7 @@
+@@ -208,7 +208,7 @@
  
  DEPENDENCYRELEASEFILESWITHOUTREADME = \
  	lib/additional/commons-codec-1.3.jar \
@@ -25,7 +25,7 @@
  	lib/additional/excalibur-bzip2-1.0.jar \
  	lib/additional/hsqldb.jar \
  	lib/additional/vecmath1.2-1.14.jar \
-@@ -227,7 +227,7 @@
+@@ -232,7 +232,7 @@
  
  DOSEUTILITYDEPENDENCYRELEASEFILES = \
  	lib/additional/commons-codec-1.3.jar \
@@ -34,7 +34,7 @@
  	lib/additional/excalibur-bzip2-1.0.jar \
  	lib/additional/hsqldb.jar \
  	lib/additional/vecmath1.2-1.14.jar \
-@@ -294,7 +294,7 @@
+@@ -299,7 +299,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 \
@@ -43,7 +43,7 @@
  	DoseUtility.app/Contents/Resources/Java/jmdns.jar \
  	DoseUtility.app/Contents/Resources/Java/jai_imageio.jar \
  	DoseUtility.app/Contents/Resources/DoseUtility.icns \
-@@ -443,7 +443,7 @@
+@@ -456,7 +456,7 @@
  	cp $< $@
  	jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
  
@@ -52,7 +52,7 @@
  	mkdir -p webstart
  	cp $< $@
  	jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
-@@ -698,7 +698,7 @@
+@@ -711,7 +711,7 @@
  	mkdir -p DoseUtility.app/Contents/Resources/Java
  	cp $< $@
  
@@ -61,7 +61,7 @@
  	mkdir -p DoseUtility.app/Contents/Resources/Java
  	cp $< $@
  
-@@ -898,7 +898,7 @@
+@@ -911,7 +911,7 @@
  javadoc:
  	rm -rf docs/javadoc
  	javadoc \
@@ -70,10 +70,10 @@
  		-link http://download.oracle.com/javase/1.5.0/docs/api/ \
  		-link http://jpedal.org/javadoc/ \
  		-link http://www.hsqldb.org/doc/src/ \
-Index: pixelmed-20130220/Makefile.common.mk
+Index: pixelmed-20130426/Makefile.common.mk
 ===================================================================
---- pixelmed-20130220.orig/Makefile.common.mk	2013-04-24 15:24:46.986587566 +0200
-+++ pixelmed-20130220/Makefile.common.mk	2013-04-24 15:25:02.034587393 +0200
+--- pixelmed-20130426.orig/Makefile.common.mk	2013-06-03 09:31:34.653247695 +0200
++++ pixelmed-20130426/Makefile.common.mk	2013-06-03 09:31:41.821247614 +0200
 @@ -35,7 +35,7 @@
  
  DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar
@@ -83,10 +83,10 @@
  
  VIEWERADDITIONALJARS = ${DISPLAYADDITIONALJARS}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/jmdns.jar
  
-Index: pixelmed-20130220/webstart/DoseUtility.jnlp
+Index: pixelmed-20130426/webstart/DoseUtility.jnlp
 ===================================================================
---- pixelmed-20130220.orig/webstart/DoseUtility.jnlp	2011-12-08 14:10:09.000000000 +0100
-+++ pixelmed-20130220/webstart/DoseUtility.jnlp	2013-04-24 15:25:02.034587393 +0200
+--- pixelmed-20130426.orig/webstart/DoseUtility.jnlp	2011-12-08 14:10:09.000000000 +0100
++++ pixelmed-20130426/webstart/DoseUtility.jnlp	2013-06-03 09:31:41.821247614 +0200
 @@ -19,7 +19,7 @@
      <j2se version="1.5+" java-vm-args="-Xmx768m -Xss2m"/>
      <jar href="pixelmed.jar"/>

Modified: trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,3 +1,7 @@
+Description: Allow off-line JNLP apps
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
 Index: pixelmed-20130220/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
 ===================================================================
 --- pixelmed-20130220.orig/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp	2013-04-25 14:05:03.969668634 +0200

Modified: trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,11 +1,11 @@
 Description: fix doc generation
 Author: Mathieu Malaterre <malat at debian.org>
 
-Index: pixelmed-20130220/Makefile
+Index: pixelmed-20130426/Makefile
 ===================================================================
---- pixelmed-20130220.orig/Makefile	2013-04-25 10:47:20.705802199 +0200
-+++ pixelmed-20130220/Makefile	2013-04-25 10:51:56.773799093 +0200
-@@ -899,7 +899,7 @@
+--- pixelmed-20130426.orig/Makefile	2013-06-03 09:31:46.057247566 +0200
++++ pixelmed-20130426/Makefile	2013-06-03 09:31:52.853247490 +0200
+@@ -912,7 +912,7 @@
  javadoc:
  	rm -rf docs/javadoc
  	javadoc \

Modified: trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/makefile.patch	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/patches/makefile.patch	2013-06-03 08:57:12 UTC (rev 13812)
@@ -3,11 +3,11 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20110717/Makefile
+Index: pixelmed-20130426/Makefile
 ===================================================================
---- pixelmed-20110717.orig/Makefile	2011-05-06 17:36:22.000000000 +0200
-+++ pixelmed-20110717/Makefile	2011-08-19 16:52:23.000000000 +0200
-@@ -346,7 +346,7 @@
+--- pixelmed-20130426.orig/Makefile	2013-04-07 15:02:01.000000000 +0200
++++ pixelmed-20130426/Makefile	2013-06-03 09:31:38.105247656 +0200
+@@ -351,7 +351,7 @@
  		com/pixelmed/event/*.class \
  		com/pixelmed/display/event/*.class \
  		com/pixelmed/geometry/*.class \

Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/patches/series	2013-06-03 08:57:12 UTC (rev 13812)
@@ -13,3 +13,4 @@
 fix_xslt.patch
 remove_x_test.patch
 fix_jnlp.patch
+add_usage.patch

Modified: trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch	2013-06-03 08:57:12 UTC (rev 13812)
@@ -5,6 +5,7 @@
 This has been updated to use the ImageIO library.
 
 Author: Chris J Arges <chris.j.arges at canonical.com>
+Bug-Debian: http://bugs.debian.org/678383
 Bug-Ubuntu: https://launchpad.net/bugs/888993
 Last-Update: 2012-06-28
 

Modified: trunk/packages/pixelmed/trunk/debian/pixelmed-apps.install
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-apps.install	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-apps.install	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,6 +1,10 @@
 # command line tool
 debian/DicomSRValidator         usr/bin
 debian/VerificationSOPClassSCU  usr/bin
+debian/PDFToDicomImage          usr/bin
+debian/NIfTI1ToDicom            usr/bin
+debian/ImageToDicom             usr/bin
+debian/NRRDToDicom              usr/bin
 # GUI
 .com.pixelmed.display.DicomImageViewer.properties etc/pixelmed
 debian/dicomimageviewer usr/bin

Copied: trunk/packages/pixelmed/trunk/debian/pixelmed-apps.manpages (from rev 13806, trunk/packages/pixelmed/trunk/debian/pixelmed-java.manpages)
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-apps.manpages	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-apps.manpages	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,3 @@
+debian/dicomimageviewer.1
+debian/ecgviewer.1
+debian/doseutility.1

Deleted: trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.doc-base
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.doc-base	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.doc-base	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,9 +0,0 @@
-Document: pixelmed-java-doc
-Title: API JavaDoc for pixelmed-java
-Author: David Clunie
-Abstract: This the API JavaDoc for pixelmed-java
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/pixelmed-java-doc/index.html
-Files: /usr/share/doc/pixelmed-java-doc/*.html

Deleted: trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.docs
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.docs	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.docs	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1 +0,0 @@
-docs/javadoc/*

Deleted: trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.javadoc
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.javadoc	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java-doc.javadoc	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1 +0,0 @@
-com.pixelmed

Deleted: trunk/packages/pixelmed/trunk/debian/pixelmed-java.jlibs
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java.jlibs	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java.jlibs	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1 +0,0 @@
-pixelmed.jar

Deleted: trunk/packages/pixelmed/trunk/debian/pixelmed-java.manpages
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-java.manpages	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-java.manpages	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,3 +0,0 @@
-debian/dicomimageviewer.1
-debian/ecgviewer.1
-debian/doseutility.1

Modified: trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.install
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.install	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.install	2013-06-03 08:57:12 UTC (rev 13812)
@@ -1,10 +1,12 @@
 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
+debian/DicomImageBlackout usr/bin
+debian/MediaImporter      usr/bin
+debian/WatchFolderAndSend usr/bin
+debian/DicomImageViewer   usr/bin
+debian/ConvertAmicasJPEG2000FilesetToDicom  usr/bin
+debian/DicomCleaner                         usr/bin
+debian/DoseUtility                          usr/bin
+# .desktop
+debian/*.desktop usr/share/applications

Added: trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.lintian-overrides
===================================================================
--- trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.lintian-overrides	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/pixelmed-webstart-apps.lintian-overrides	2013-06-03 08:57:12 UTC (rev 13812)
@@ -0,0 +1,2 @@
+# GUI do not need man page
+pixelmed-webstart-apps: binary-without-manpage

Modified: trunk/packages/pixelmed/trunk/debian/rules
===================================================================
--- trunk/packages/pixelmed/trunk/debian/rules	2013-06-03 08:53:29 UTC (rev 13811)
+++ trunk/packages/pixelmed/trunk/debian/rules	2013-06-03 08:57:12 UTC (rev 13812)
@@ -30,10 +30,11 @@
 	# doc package:
 	rm -rf docs
 
-#debian/%.desktop: webstart/%.jnlp debian/jnlp2script.xsl
-debian/%: webstart/%.jnlp debian/jnlp2script.xsl
+debian/%.desktop: webstart/%.jnlp debian/jnlp2desktop.xsl
 	# create .desktop file:
 	xsltproc --stringparam pixelmed_version $(VERSION) -o $@ debian/jnlp2desktop.xsl $<
+
+debian/%: webstart/%.jnlp debian/jnlp2script.xsl debian/%.desktop 
 	# script wrapper:
 	xsltproc --stringparam pixelmed_version $(VERSION) -o $@ debian/jnlp2script.xsl $<
 	chmod +x $@

More information about the debian-med-commit mailing list