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

[malat-guest at alioth.debian.org]

Author: malat-guest
Date: 2009-01-08 14:55:49 +0000 (Thu, 08 Jan 2009)
New Revision: 2928

Modified:
   trunk/packages/dicomscope/trunk/debian/dicomscope.install
   trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
   trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch
Log:
install reports

Modified: trunk/packages/dicomscope/trunk/debian/dicomscope.install
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.install	2009-01-08 14:49:47 UTC (rev 2927)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.install	2009-01-08 14:55:49 UTC (rev 2928)
@@ -2,6 +2,7 @@
 usr/share/dicomscope/DICOMscope.jar
 usr/share/dicomscope/codes.dic
 usr/share/dicomscope/lut/*.lut
+usr/share/dicomscope/reports/*.dcm
 etc/dcmtk/DICOMscope.cfg
 usr/share/dicomscope/tcl/dcmpsdmp.tcl
 usr/share/dicomscope/tcl/dcmpschk.tcl

Modified: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2009-01-08 14:49:47 UTC (rev 2927)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2009-01-08 14:55:49 UTC (rev 2928)
@@ -93,12 +93,13 @@
 +
 --- /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,41 @@
+@@ -0,0 +1,43 @@
 +# Java
 +FIND_PACKAGE(Java REQUIRED) # javac, jar
 +
 +file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java")
 +file(GLOB lutfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/lut/*.lut")
++file(GLOB reportfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/reports/*.dcm")
 +#message(${lutfiles})
 +
 +#FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
@@ -126,6 +127,7 @@
 +  COMMENT "building DICOMscope.jar"
 +)
 +
++  INSTALL(FILES ${reportfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/reports COMPONENT Runtime)
 +  INSTALL(FILES ${lutfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/lut COMPONENT Runtime)
 +  INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/dicomscope DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime)
 +  INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpschk.tcl ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpsdmp.tcl DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/tcl COMPONENT Runtime)

Modified: trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch	2009-01-08 14:49:47 UTC (rev 2927)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch	2009-01-08 14:55:49 UTC (rev 2928)
@@ -1,5 +1,5 @@
 --- dsgui360/DICOMscope/DICOMscope.cfg.orig	2009-01-08 12:50:39.675600000 +0100
-+++ dsgui360/DICOMscope/DICOMscope.cfg	2009-01-08 15:43:12.201715000 +0100
++++ dsgui360/DICOMscope/DICOMscope.cfg	2009-01-08 15:54:12.039628000 +0100
 @@ -157,15 +157,15 @@
  # ----------------------------------------------------------------------------
  
@@ -28,6 +28,15 @@
  
  # ----------------------------------------------------------------------------
  # General Structured Reporting (SR) settings in this section.
+@@ -181,7 +181,7 @@
+ # ----------------------------------------------------------------------------
+ 
+ # directory in which SR "template" files reside
+-Directory = reports
++Directory = /usr/share/dicomscope/reports
+ 
+ # ----------------------------------------------------------------------------
+ # This section contains the settings for network communication.
 @@ -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