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

malat-guest at alioth.debian.org malat-guest at alioth.debian.org
Tue Dec 30 09:38:16 UTC 2008 

Author: malat-guest
Date: 2008-12-30 09:38:15 +0000 (Tue, 30 Dec 2008)
New Revision: 2881

Added:
   trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
   trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch
Modified:
   trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
   trunk/packages/dicomscope/trunk/debian/patches/series
Log:
split patch into smaller one for readability

Added: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2008-12-30 09:38:15 UTC (rev 2881)
@@ -0,0 +1,126 @@
+Instead of using the in-src dcmtk build system, provide a replacement one
+that allow building dicomscope outside of dcmtk
+
+--- /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,24 @@
++PROJECT(DICOMSCOPE)
++
++cmake_minimum_required(VERSION 2.6)
++
++#-----------------------------------------------------------------------------
++SET (EXECUTABLE_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
++SET (LIBRARY_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
++MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
++
++IF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
++  SET(DICOMSCOPE_INSTALL_BIN_DIR "bin")
++ENDIF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
++
++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)
++
++SUBDIRS(interface/libsrc)
++SUBDIRS(tkgui)
+--- /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
++++ dsgui351/interface/libsrc/CMakeLists.txt	2008-12-23 16:10:17.385621000 +0100
+@@ -0,0 +1,55 @@
++SET(dsgui_SRCS
++DSRCodeValue.cpp
++DSRCompositeValue.cpp
++DSRDocument.cpp
++DSRDocumentTree.cpp
++DSRImageValue.cpp
++DSRNumericValue.cpp
++DSRSCoordValue.cpp
++DSRTCoordValue.cpp
++DSRWaveformValue.cpp
++DVInterface.cpp
++DVPresentationState.cpp
++DVPSCurve.cpp
++DVPSGraphicObject.cpp
++DVPSStoredPrint.cpp
++DVPSTextObject.cpp
++)
++FIND_PACKAGE(JNI REQUIRED)
++INCLUDE_DIRECTORIES(
++  #${JNI_INCLUDE_PATH} # cmake bug #
++  ${JAVA_INCLUDE_PATH}
++  ${JAVA_INCLUDE_PATH2}
++  ${JAVA_AWT_INCLUDE_PATH}
++  )
++
++FIND_PACKAGE(DCMTK REQUIRED)
++# /usr/include/dcmtk/dcmpstat/dviface.h
++FIND_PATH( DCMTK_dcmpstat_INCLUDE_DIR dviface.h
++  ${DCMTK_DIR}/dcmpstat/include
++  ${DCMTK_DIR}/include/dcmpstat
++)
++# /usr/include/dcmtk/dcmsr/dsrdoc.h
++FIND_PATH( DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h
++  ${DCMTK_DIR}/dcmsr/include
++  ${DCMTK_DIR}/include/dcmsr
++)
++
++#  MESSAGE(${DCMTK_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(
++  ${DCMTK_INCLUDE_DIR}
++  ${DCMTK_dcmpstat_INCLUDE_DIR}
++  ${DCMTK_dcmsr_INCLUDE_DIR}
++)
++
++ADD_DEFINITIONS(-DHAVE_CONFIG_H  -DNDEBUG -DHAVE_STRSTREAM_H)
++
++#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
++TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr xml2 dcmdsig dcmqrdb crypto)
++  INSTALL(TARGETS jInterface
++    RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime
++    LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP}
++    ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development
++  )
++
+--- /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 @@
++# Java
++FIND_PACKAGE(Java REQUIRED) # javac, jar
++
++file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java")
++#message(${javafiles})
++
++#FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
++
++ADD_CUSTOM_COMMAND(
++  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 ${DICOMSCOPE_SOURCE_DIR}/tkgui/Manifest.txt ./
++  # manifest thingy
++  #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"
++)
++
++ADD_CUSTOM_TARGET(dummy ALL
++  DEPENDS ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
++  COMMENT "building DICOMscope.jar"
++)
++
++  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic
++    DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime
++  )
++


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

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 23:35:12 UTC (rev 2880)
+++ trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch	2008-12-30 09:38:15 UTC (rev 2881)
@@ -1,95 +1,5 @@
---- /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
-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,24 @@
-+PROJECT(DICOMSCOPE)
-+
-+cmake_minimum_required(VERSION 2.6)
-+
-+#-----------------------------------------------------------------------------
-+SET (EXECUTABLE_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
-+SET (LIBRARY_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
-+MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
-+
-+IF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
-+  SET(DICOMSCOPE_INSTALL_BIN_DIR "bin")
-+ENDIF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
-+
-+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)
-+
-+SUBDIRS(interface/libsrc)
-+SUBDIRS(tkgui)
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt dsgui351/interface/libsrc/CMakeLists.txt
---- /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ dsgui351/interface/libsrc/CMakeLists.txt	2008-12-23 16:10:17.385621000 +0100
-@@ -0,0 +1,55 @@
-+SET(dsgui_SRCS
-+DSRCodeValue.cpp
-+DSRCompositeValue.cpp
-+DSRDocument.cpp
-+DSRDocumentTree.cpp
-+DSRImageValue.cpp
-+DSRNumericValue.cpp
-+DSRSCoordValue.cpp
-+DSRTCoordValue.cpp
-+DSRWaveformValue.cpp
-+DVInterface.cpp
-+DVPresentationState.cpp
-+DVPSCurve.cpp
-+DVPSGraphicObject.cpp
-+DVPSStoredPrint.cpp
-+DVPSTextObject.cpp
-+)
-+FIND_PACKAGE(JNI REQUIRED)
-+INCLUDE_DIRECTORIES(
-+  #${JNI_INCLUDE_PATH} # cmake bug #
-+  ${JAVA_INCLUDE_PATH}
-+  ${JAVA_INCLUDE_PATH2}
-+  ${JAVA_AWT_INCLUDE_PATH}
-+  )
-+
-+FIND_PACKAGE(DCMTK REQUIRED)
-+# /usr/include/dcmtk/dcmpstat/dviface.h
-+FIND_PATH( DCMTK_dcmpstat_INCLUDE_DIR dviface.h
-+  ${DCMTK_DIR}/dcmpstat/include
-+  ${DCMTK_DIR}/include/dcmpstat
-+)
-+# /usr/include/dcmtk/dcmsr/dsrdoc.h
-+FIND_PATH( DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h
-+  ${DCMTK_DIR}/dcmsr/include
-+  ${DCMTK_DIR}/include/dcmsr
-+)
-+
-+#  MESSAGE(${DCMTK_INCLUDE_DIR})
-+INCLUDE_DIRECTORIES(
-+  ${DCMTK_INCLUDE_DIR}
-+  ${DCMTK_dcmpstat_INCLUDE_DIR}
-+  ${DCMTK_dcmsr_INCLUDE_DIR}
-+)
-+
-+ADD_DEFINITIONS(-DHAVE_CONFIG_H  -DNDEBUG -DHAVE_STRSTREAM_H)
-+
-+#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-+ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
-+TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr xml2 dcmdsig dcmqrdb crypto)
-+  INSTALL(TARGETS jInterface
-+    RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime
-+    LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP}
-+    ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development
-+  )
-+
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp dsgui351/interface/libsrc/DSRCodeValue.cpp
+sets of patch related to dcmtk 350 -> dcmtk 354 backward incompatible changes
+
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp	2000-12-06 16:41:34.000000000 +0100
 +++ dsgui351/interface/libsrc/DSRCodeValue.cpp	2008-12-23 12:46:01.513221000 +0100
 @@ -116,7 +116,7 @@
@@ -110,7 +20,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRCompositeValue.cpp dsgui351/interface/libsrc/DSRCompositeValue.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRCompositeValue.cpp	2001-02-16 16:59:56.000000000 +0100
 +++ dsgui351/interface/libsrc/DSRCompositeValue.cpp	2008-12-23 12:46:19.114065000 +0100
 @@ -147,7 +147,7 @@
@@ -122,7 +31,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocument.cpp dsgui351/interface/libsrc/DSRDocument.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocument.cpp	2001-05-22 12:35:00.000000000 +0200
 +++ dsgui351/interface/libsrc/DSRDocument.cpp	2008-12-23 14:00:57.891356000 +0100
 @@ -43,7 +43,9 @@
@@ -397,7 +305,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocumentTree.cpp dsgui351/interface/libsrc/DSRDocumentTree.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocumentTree.cpp	2001-01-25 15:54:42.000000000 +0100
 +++ dsgui351/interface/libsrc/DSRDocumentTree.cpp	2008-12-23 14:01:26.476717000 +0100
 @@ -391,7 +391,7 @@
@@ -427,7 +334,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRImageValue.cpp dsgui351/interface/libsrc/DSRImageValue.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRImageValue.cpp	2001-02-16 16:58:52.000000000 +0100
 +++ dsgui351/interface/libsrc/DSRImageValue.cpp	2008-12-23 14:01:59.829134000 +0100
 @@ -147,7 +147,7 @@
@@ -466,7 +372,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRNumericValue.cpp dsgui351/interface/libsrc/DSRNumericValue.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRNumericValue.cpp	2000-11-23 17:57:28.000000000 +0100
 +++ dsgui351/interface/libsrc/DSRNumericValue.cpp	2008-12-23 14:02:14.230292000 +0100
 @@ -165,7 +165,7 @@
@@ -487,7 +392,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRSCoordValue.cpp dsgui351/interface/libsrc/DSRSCoordValue.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRSCoordValue.cpp	2000-10-23 17:22:04.000000000 +0200
 +++ dsgui351/interface/libsrc/DSRSCoordValue.cpp	2008-12-23 14:02:50.550467000 +0100
 @@ -88,7 +88,7 @@
@@ -517,7 +421,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRTCoordValue.cpp dsgui351/interface/libsrc/DSRTCoordValue.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRTCoordValue.cpp	2000-10-27 10:42:52.000000000 +0200
 +++ dsgui351/interface/libsrc/DSRTCoordValue.cpp	2008-12-23 14:03:02.022825000 +0100
 @@ -88,7 +88,7 @@
@@ -529,7 +432,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRWaveformValue.cpp dsgui351/interface/libsrc/DSRWaveformValue.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRWaveformValue.cpp	2001-02-16 17:00:24.000000000 +0100
 +++ dsgui351/interface/libsrc/DSRWaveformValue.cpp	2008-12-23 14:03:26.182329000 +0100
 @@ -147,7 +147,7 @@
@@ -559,7 +461,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVInterface.cpp dsgui351/interface/libsrc/DVInterface.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DVInterface.cpp	2001-01-29 18:26:32.000000000 +0100
 +++ dsgui351/interface/libsrc/DVInterface.cpp	2008-12-23 14:09:32.873638000 +0100
 @@ -121,7 +121,7 @@
@@ -1264,7 +1165,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPresentationState.cpp dsgui351/interface/libsrc/DVPresentationState.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DVPresentationState.cpp	2000-11-23 17:45:22.000000000 +0100
 +++ dsgui351/interface/libsrc/DVPresentationState.cpp	2008-12-23 14:17:45.488320000 +0100
 @@ -179,7 +179,7 @@
@@ -2135,7 +2035,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPSCurve.cpp dsgui351/interface/libsrc/DVPSCurve.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSCurve.cpp	1999-09-21 18:07:30.000000000 +0200
 +++ dsgui351/interface/libsrc/DVPSCurve.cpp	2008-12-23 14:18:01.796119000 +0100
 @@ -148,7 +148,7 @@
@@ -2156,7 +2055,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPSGraphicObject.cpp dsgui351/interface/libsrc/DVPSGraphicObject.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSGraphicObject.cpp	1999-09-21 18:07:30.000000000 +0200
 +++ dsgui351/interface/libsrc/DVPSGraphicObject.cpp	2008-12-23 14:18:22.022391000 +0100
 @@ -131,7 +131,7 @@
@@ -2204,7 +2102,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPSStoredPrint.cpp dsgui351/interface/libsrc/DVPSStoredPrint.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSStoredPrint.cpp	2000-07-18 13:04:18.000000000 +0200
 +++ dsgui351/interface/libsrc/DVPSStoredPrint.cpp	2008-12-23 14:19:20.804343000 +0100
 @@ -82,7 +82,7 @@
@@ -2459,7 +2356,6 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPSTextObject.cpp dsgui351/interface/libsrc/DVPSTextObject.cpp
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSTextObject.cpp	1999-09-21 18:07:30.000000000 +0200
 +++ dsgui351/interface/libsrc/DVPSTextObject.cpp	2008-12-23 14:19:32.635340000 +0100
 @@ -127,7 +127,7 @@
@@ -2489,74 +2385,3 @@
  }
  
  
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/tkgui/about/AboutBox.java dsgui351/tkgui/about/AboutBox.java
---- /tmp/dicomscope/dsgui351/tkgui/about/AboutBox.java	2001-06-06 12:32:30.000000000 +0200
-+++ dsgui351/tkgui/about/AboutBox.java	2008-12-23 15:50:13.812215000 +0100
-@@ -38,7 +38,7 @@
- import javax.swing.text.*;
- import java.net.*;
- 
--import DICOMscope;
-+import DICOMscope.DICOMscope;
- 
- import jToolkit.gui.*;
- import java.util.*;
-diff --strip-trailing-cr -x bin -N -u -r /tmp/dicomscope/dsgui351/tkgui/browser/StudyMan.java dsgui351/tkgui/browser/StudyMan.java
---- /tmp/dicomscope/dsgui351/tkgui/browser/StudyMan.java	2001-06-06 12:32:30.000000000 +0200
-+++ dsgui351/tkgui/browser/StudyMan.java	2008-12-23 15:13:51.617836000 +0100
-@@ -40,7 +40,7 @@
- import javax.swing.tree.*;
- 
- import J2Ci.*;
--import DICOMscope;
-+import DICOMscope.DICOMscope;
- import viewer.main.*;
- import jToolkit.gui.*;
- 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:40:45.637769000 +0100
-@@ -0,0 +1,35 @@
-+# Java
-+FIND_PACKAGE(Java REQUIRED) # javac, jar
-+
-+file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java")
-+#message(${javafiles})
-+
-+#FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
-+
-+ADD_CUSTOM_COMMAND(
-+  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 ${DICOMSCOPE_SOURCE_DIR}/tkgui/Manifest.txt ./
-+  # manifest thingy
-+  #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"
-+)
-+
-+ADD_CUSTOM_TARGET(dummy ALL
-+  DEPENDS ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+  COMMENT "building DICOMscope.jar"
-+)
-+
-+  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
---- /tmp/dicomscope/dsgui351/tkgui/DICOMscope.java	2001-06-06 12:32:30.000000000 +0200
-+++ dsgui351/tkgui/DICOMscope.java	2008-12-23 16:15:36.587279000 +0100
-@@ -1,3 +1,4 @@
-+package DICOMscope;
- /*
-  *
-  *  Copyright (C) 1999, Institute for MicroTherapy

Added: trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch	2008-12-30 09:38:15 UTC (rev 2881)
@@ -0,0 +1,30 @@
+Starting with Java 1.4, sun-java does not support default package anymore. Instead
+call DICOMscope now: DICOMscope.DICOMscope
+In order to create a jar with a main entry point, provide a manifest.txt file
+
+--- /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
+--- /tmp/dicomscope/dsgui351/tkgui/about/AboutBox.java	2001-06-06 12:32:30.000000000 +0200
++++ dsgui351/tkgui/about/AboutBox.java	2008-12-23 15:50:13.812215000 +0100
+@@ -38,7 +38,7 @@
+ import javax.swing.text.*;
+ import java.net.*;
+ 
+-import DICOMscope;
++import DICOMscope.DICOMscope;
+ 
+ import jToolkit.gui.*;
+ import java.util.*;
+--- /tmp/dicomscope/dsgui351/tkgui/browser/StudyMan.java	2001-06-06 12:32:30.000000000 +0200
++++ dsgui351/tkgui/browser/StudyMan.java	2008-12-23 15:13:51.617836000 +0100
+@@ -40,7 +40,7 @@
+ import javax.swing.tree.*;
+ 
+ import J2Ci.*;
+-import DICOMscope;
++import DICOMscope.DICOMscope;
+ import viewer.main.*;
+ import jToolkit.gui.*;
+ import main.*;


Property changes on: trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.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	2008-12-29 23:35:12 UTC (rev 2880)
+++ trunk/packages/dicomscope/trunk/debian/patches/series	2008-12-30 09:38:15 UTC (rev 2881)
@@ -1 +1,3 @@
 dcmtk_350_354_changes.patch
+cmakelists.txt.patch
+dicomscope_defaultpackage.patch

More information about the debian-med-commit mailing list