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

[malat-guest at alioth.debian.org]

Author: malat-guest
Date: 2008-12-29 14:13:18 +0000 (Mon, 29 Dec 2008)
New Revision: 2874

Added:
   trunk/packages/dicomscope/trunk/debian/README.Debian
Modified:
   trunk/packages/dicomscope/trunk/debian/dicomscope.install
   trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
Log:
fix install

Added: trunk/packages/dicomscope/trunk/debian/README.Debian
===================================================================
--- trunk/packages/dicomscope/trunk/debian/README.Debian	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/README.Debian	2008-12-29 14:13:18 UTC (rev 2874)
@@ -0,0 +1,4 @@
+you can start the app using:
+
+ java -jar /usr/share/dicomscope/DICOMscope.jar
+


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

Modified: trunk/packages/dicomscope/trunk/debian/dicomscope.install
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.install	2008-12-29 13:45:18 UTC (rev 2873)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.install	2008-12-29 14:13:18 UTC (rev 2874)
@@ -1,2 +1,3 @@
 usr/lib/libjInterface.so
-usr/lib/DICOMscope.jar
+usr/share/dicomscope/DICOMscope.jar
+usr/share/dicomscope/codes.dic

Modified: trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch	2008-12-29 13:45:18 UTC (rev 2873)
+++ trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch	2008-12-29 14:13:18 UTC (rev 2874)
@@ -1,11 +1,11 @@
 --- /tmp/dicomscope/dsgui351/tkgui/Manifest.txt	1970-01-01 01:00:00.000000000 +0100
 +++ dsgui351/tkgui/Manifest.txt	2008-12-23 16:30:12.943647000 +0100
 @@ -0,0 +1 @@
-+Main-Class: DICOMscope.DICOMscope.DICOMscope
++Main-Class: DICOMscope.DICOMscope
 diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/CMakeLists.txt dsgui351/CMakeLists.txt
 --- /tmp/dicomscope/dsgui351/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
 +++ dsgui351/CMakeLists.txt	2008-12-23 16:30:12.943647000 +0100
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,24 @@
 +PROJECT(DICOMSCOPE)
 +
 +cmake_minimum_required(VERSION 2.6)
@@ -22,6 +22,9 @@
 +IF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
 +  SET(DICOMSCOPE_INSTALL_LIB_DIR "lib")
 +ENDIF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
++IF(NOT DICOMSCOPE_INSTALL_JAVA_DIR)
++  SET(DICOMSCOPE_INSTALL_JAVA_DIR "share/dicomscope")
++ENDIF(NOT DICOMSCOPE_INSTALL_JAVA_DIR)
 +
 +INCLUDE_DIRECTORIES(interface/include)
 +
@@ -2529,23 +2532,23 @@
 +file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java")
 +#message(${javafiles})
 +
-+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
++#FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
 +
 +ADD_CUSTOM_COMMAND(
-+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope/DICOMscope.class
-+  COMMAND ${JAVA_COMPILE} ARGS ${javafiles} -d ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope
-+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++  OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
++  COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . DICOMscope.java
++  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 +  DEPENDS ${javafiles}
 +  COMMENT "javac *.java"
 +)
 +
 +ADD_CUSTOM_COMMAND(
 +  OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+  COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${CMAKE_CURRENT_SOURCE_DIR}/Manifest.txt DICOMscope/
++  COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/tkgui/Manifest.txt ./
 +  # manifest thingy
-+  COMMAND ${JAVA_ARCHIVE} ARGS i ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope/DICOMscope.class
++  #COMMAND ${JAVA_ARCHIVE} ARGS i ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
++  WORKING_DIRECTORY ${DICOMSCOPE_SOURCE_DIR}/DICOMscope
++  DEPENDS ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
 +  COMMENT "jar cvf -> DICOMscope.jar"
 +)
 +
@@ -2554,8 +2557,8 @@
 +  COMMENT "building DICOMscope.jar"
 +)
 +
-+  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+    DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime
++  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic
++    DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime
 +  )
 +
 diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/tkgui/DICOMscope.java dsgui351/tkgui/DICOMscope.java