[med-svn] r2846 - trunk/packages/dicomscope/trunk/debian/patches

[malat-guest at alioth.debian.org]

Author: malat-guest
Date: 2008-12-23 15:44:28 +0000 (Tue, 23 Dec 2008)
New Revision: 2846

Modified:
   trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
Log:
fix path

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-23 15:33:38 UTC (rev 2845)
+++ trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch	2008-12-23 15:44:28 UTC (rev 2846)
@@ -2517,8 +2517,8 @@
  import main.*;
 diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/tkgui/CMakeLists.txt dsgui351/tkgui/CMakeLists.txt
 --- /tmp/dicomscope/dsgui351/tkgui/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ dsgui351/tkgui/CMakeLists.txt	2008-12-23 16:26:42.432837000 +0100
-@@ -0,0 +1,33 @@
++++ dsgui351/tkgui/CMakeLists.txt	2008-12-23 16:40:45.637769000 +0100
+@@ -0,0 +1,35 @@
 +# Java
 +FIND_PACKAGE(Java REQUIRED) # javac, jar
 +
@@ -2528,7 +2528,7 @@
 +FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
 +
 +ADD_CUSTOM_COMMAND(
-+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope.class
++  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}
 +  DEPENDS ${javafiles}
@@ -2537,9 +2537,11 @@
 +
 +ADD_CUSTOM_COMMAND(
 +  OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+  COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope
++  COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar DICOMscope/
++  # manifest thingy
++  COMMAND ${JAVA_ARCHIVE} ARGS i ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
 +  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope.class
++  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope/DICOMscope.class
 +  COMMENT "jar cvf -> DICOMscope.jar"
 +)
 +