[med-svn] r2923 - in trunk/packages/dicomscope/trunk/debian: . patches

Thu Jan 8 12:00:43 UTC 2009

Author: malat-guest
Date: 2009-01-08 12:00:42 +0000 (Thu, 08 Jan 2009)
New Revision: 2923

Added:
   trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch
   trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
Modified:
   trunk/packages/dicomscope/trunk/debian/control
   trunk/packages/dicomscope/trunk/debian/dicomscope.install
   trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
   trunk/packages/dicomscope/trunk/debian/patches/series
Log:
ENH: finish up installation

Modified: trunk/packages/dicomscope/trunk/debian/control
===================================================================

--- trunk/packages/dicomscope/trunk/debian/control	2009-01-08 09:08:05 UTC (rev 2922)
+++ trunk/packages/dicomscope/trunk/debian/control	2009-01-08 12:00:42 UTC (rev 2923)
@@ -12,7 +12,7 @@
 
 Package: dicomscope
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.3 | tk8.4
 Description: The OFFIS DICOM Viewer
  DICOMscope is a free DICOM viewer which can display uncompressed, monochrome DICOM images from all modalities and which supports monitor calibration according to DICOM part 14 as well as presentation states. DICOMscope offers a print client (DICOM Basic Grayscale Print Management) which also implements the optional Presentation LUT SOP Class. The development of this prototype was commissioned by the "Committee for the Advancement of DICOM" and demonstrated at the European Congress of Radiology ECR 1999. An enhanced version was developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has been demonstrated at ECR 2001 and contains numerous extensions, including a print server, support for encrypted DICOM communication, digital signatures and structured reporting.
 

Modified: trunk/packages/dicomscope/trunk/debian/dicomscope.install
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.install	2009-01-08 09:08:05 UTC (rev 2922)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.install	2009-01-08 12:00:42 UTC (rev 2923)
@@ -1,3 +1,7 @@
 usr/lib/libjInterface.so
 usr/share/dicomscope/DICOMscope.jar
 usr/share/dicomscope/codes.dic
+etc/dcmtk/DICOMscope.cfg
+usr/share/dicomscope/tcl/dcmpsdmp.tcl
+usr/share/dicomscope/tcl/dcmpschk.tcl
+usr/share/dcmtk/codes.dic

Modified: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2009-01-08 09:08:05 UTC (rev 2922)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2009-01-08 12:00:42 UTC (rev 2923)
@@ -93,7 +93,7 @@
 +
 --- /tmp/dicomscope/dsgui351/tkgui/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
 +++ dsgui351/tkgui/CMakeLists.txt	2008-12-23 16:40:45.637769000 +0100
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,38 @@
 +# Java
 +FIND_PACKAGE(Java REQUIRED) # javac, jar
 +
@@ -125,6 +125,9 @@
 +  COMMENT "building DICOMscope.jar"
 +)
 +
++  INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpschk.tcl ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpsdmp.tcl DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/tcl COMPONENT Runtime)
++  INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.cfg DESTINATION /etc/dcmtk COMPONENT Runtime)
++  INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic DESTINATION /usr/share/dcmtk COMPONENT Runtime)
 +  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic
 +    DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime
 +  )

Added: trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch	2009-01-08 12:00:42 UTC (rev 2923)
@@ -0,0 +1,49 @@
+--- dsgui360/DICOMscope/DICOMscope.cfg.orig	2009-01-08 12:50:39.675600000 +0100
++++ dsgui360/DICOMscope/DICOMscope.cfg	2009-01-08 12:51:28.745177000 +0100
+@@ -157,15 +157,15 @@
+ # ----------------------------------------------------------------------------
+ 
+ # directory in which DICOM images and index.dat reside
+-Directory = database
++Directory = /var/lib/dcmtk/db/READWRITE
+ 
+ # Path to the dump tool used to display the contents of DICOM files located
+ # in the database
+-Dump = c:\program files\tcl\bin\wish83 dcmpsdmp.tcl
++Dump = /usr/bin/wish /usr/share/dicomscope/tcl/dcmpsdmp.tcl
+ 
+ # Path to the check tool used to evaluate the contents of DICOM files located
+ # in the database
+-Check = c:\program files\tcl\bin\wish83 dcmpschk.tcl
++Check = /usr/bin/wish /usr/share/dicomscope/tcl/dcmpschk.tcl
+ 
+ # ----------------------------------------------------------------------------
+ # General Presentation LUT settings in this section.
+@@ -254,7 +254,7 @@
+ # Path to the DICOM query/retrieve server (Q/R SCP) to be used.
+ # The configuration filename is created from this entry by adding the file
+ # extension ".cfg".
+-Server = imagectn
++Server = dcmqrscp
+ 
+ # IP Port number on which the server listens for new connections.
+ # On Unix platforms, the receiver must be started with setuid root
+@@ -267,8 +267,8 @@
+ # Default is 16384.
+ MaxPDU = 32768
+ 
+-# Application entity title imagectn will use to identify itself.
+-AETitle = IMAGECTN
++# Application entity title dcmqrscp will use to identify itself.
++AETitle = DCMQRSCP
+ 
+ # Maximum number of associations the server can handle at the same time.
+ # This is only applicable on Unix platforms, since Windows does not support
+@@ -1065,6 +1065,7 @@
+ Hostname = localhost
+ Port = 10006
+ Type = LOCALPRINTER
++
+ DisableNewVRs = true
+ DisplayFormat=1,1
+ FilmDestination = STOREDPRINT


Property changes on: trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch	2009-01-08 12:00:42 UTC (rev 2923)
@@ -0,0 +1,11 @@
+--- dsgui360/tkgui/main/MainContext.java.orig	2009-01-08 12:53:45.530106000 +0100
++++ dsgui360/tkgui/main/MainContext.java	2009-01-08 12:54:00.689769000 +0100
+@@ -148,7 +148,7 @@
+         //System.out.println("MainContext.iconPath " +MainContext.iconPath );
+         //Load deviceColorModell
+         loadDeviceInformation();
+-        codeList = new SRCodeList("codes.dic");
++        codeList = new SRCodeList("/usr/share/dcmtk/codes.dic");
+     }
+     
+     


Property changes on: trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series	2009-01-08 09:08:05 UTC (rev 2922)
+++ trunk/packages/dicomscope/trunk/debian/patches/series	2009-01-08 12:00:42 UTC (rev 2923)
@@ -2,3 +2,5 @@
 cmakelists.txt.patch
 dicomscope_defaultpackage.patch
 DVPresentationState.patch
+dicomscope.cfg.patch
+maincontext.java.patch


