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

Mathieu Malaterre malat-guest at alioth.debian.org
Tue Jun 14 21:21:32 UTC 2011 

Author: malat-guest
Date: 2011-06-14 21:21:31 +0000 (Tue, 14 Jun 2011)
New Revision: 7021

Modified:
   trunk/packages/dicomscope/trunk/debian/changelog
   trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch
   trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch
   trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
   trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch
   trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch
   trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch
   trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch
   trunk/packages/dicomscope/trunk/debian/patches/iso2utf8.patch
   trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch
   trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
Log:
prepare next release

Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/changelog	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,6 +1,7 @@
 dicomscope (3.6.0-6) unstable; urgency=low
 
   * Remove dep to tk8.3, tk8.4 and replace with wish
+  * Fix javac compilation. Closes: #627223
 
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 26 Apr 2011 20:36:47 +0200
 

Modified: trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,9 +1,9 @@
 This is undefined in the source (fix compilation)
 
-Index: b/interface/libsrc/DSRDocument.cpp
+Index: dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp
 ===================================================================
---- a/interface/libsrc/DSRDocument.cpp	2011-02-09 10:49:19.000000000 +0100
-+++ b/interface/libsrc/DSRDocument.cpp	2011-02-09 10:49:27.000000000 +0100
+--- dicomscope-3.6.0.orig/interface/libsrc/DSRDocument.cpp	2011-06-15 01:16:09.000000000 +0200
++++ dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp	2011-06-15 01:17:52.000000000 +0200
 @@ -106,7 +106,7 @@
  
      /* create local string stream */

Modified: trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,10 +1,10 @@
 Apparently the original package was compiled on 32bits and thus long and Sint32 
 could be interchanged
 
-Index: b/interface/libsrc/DVPresentationState.cpp
+Index: dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp
 ===================================================================
---- a/interface/libsrc/DVPresentationState.cpp	2011-02-09 10:49:19.000000000 +0100
-+++ b/interface/libsrc/DVPresentationState.cpp	2011-02-09 10:49:26.000000000 +0100
+--- dicomscope-3.6.0.orig/interface/libsrc/DVPresentationState.cpp	2011-06-15 01:16:11.000000000 +0200
++++ dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp	2011-06-15 01:17:26.000000000 +0200
 @@ -979,7 +979,7 @@
  {
      DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);

Modified: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,10 +1,10 @@
 Instead of using the in-src dcmtk build system, provide a replacement one
 that allow building dicomscope outside of dcmtk
 
-Index: b/CMakeLists.txt
+Index: dicomscope-3.6.0/CMakeLists.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/CMakeLists.txt	2011-02-09 10:49:25.000000000 +0100
++++ dicomscope-3.6.0/CMakeLists.txt	2011-06-15 01:17:08.000000000 +0200
 @@ -0,0 +1,24 @@
 +PROJECT(DICOMSCOPE)
 +
@@ -30,10 +30,10 @@
 +
 +SUBDIRS(interface/libsrc)
 +SUBDIRS(tkgui)
-Index: b/interface/libsrc/CMakeLists.txt
+Index: dicomscope-3.6.0/interface/libsrc/CMakeLists.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/interface/libsrc/CMakeLists.txt	2011-02-09 10:49:25.000000000 +0100
++++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt	2011-06-15 01:17:08.000000000 +0200
 @@ -0,0 +1,60 @@
 +SET(dsgui_SRCS
 +DSRCodeValue.cpp
@@ -95,10 +95,10 @@
 +    ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development
 +  )
 +
-Index: b/tkgui/CMakeLists.txt
+Index: dicomscope-3.6.0/tkgui/CMakeLists.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/tkgui/CMakeLists.txt	2011-02-09 10:49:25.000000000 +0100
++++ dicomscope-3.6.0/tkgui/CMakeLists.txt	2011-06-15 01:17:08.000000000 +0200
 @@ -0,0 +1,43 @@
 +# Java
 +FIND_PACKAGE(Java REQUIRED) # javac, jar
@@ -120,7 +120,7 @@
 +
 +ADD_CUSTOM_COMMAND(
 +  OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+  COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/MANIFEST.MF ${DICOMSCOPE_SOURCE_DIR}/DICOMscope
++  COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/MANIFEST.MF -C ${DICOMSCOPE_SOURCE_DIR}/DICOMscope .
 +  # manifest thingy
 +  #COMMAND ${JAVA_ARCHIVE} ARGS i ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
 +  WORKING_DIRECTORY ${DICOMSCOPE_SOURCE_DIR}/DICOMscope

Modified: trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,10 +1,10 @@
 This patch is due to the following change:
 
 http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=de4ba95922ebce6c30a21ee73f6790cb0aa31912#patch20
-Index: b/interface/libsrc/DSRDocument.cpp
+Index: dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp
 ===================================================================
---- a/interface/libsrc/DSRDocument.cpp	2011-02-09 10:49:27.000000000 +0100
-+++ b/interface/libsrc/DSRDocument.cpp	2011-02-09 10:49:27.000000000 +0100
+--- dicomscope-3.6.0.orig/interface/libsrc/DSRDocument.cpp	2011-06-15 01:17:52.000000000 +0200
++++ dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp	2011-06-15 01:17:54.000000000 +0200
 @@ -442,7 +442,7 @@
  {
      DSRDocument *doc = getAddressOfDSRDocument (env, obj);

Modified: trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,9 +1,9 @@
 Fix the default path to those as defined in debian packaging of dcmtk
 
-Index: b/DICOMscope/DICOMscope.cfg
+Index: dicomscope-3.6.0/DICOMscope/DICOMscope.cfg
 ===================================================================
---- a/DICOMscope/DICOMscope.cfg	2011-02-09 10:49:19.000000000 +0100
-+++ b/DICOMscope/DICOMscope.cfg	2011-02-09 10:49:26.000000000 +0100
+--- dicomscope-3.6.0.orig/DICOMscope/DICOMscope.cfg	2011-06-15 01:16:10.000000000 +0200
++++ dicomscope-3.6.0/DICOMscope/DICOMscope.cfg	2011-06-15 01:17:29.000000000 +0200
 @@ -157,15 +157,15 @@
  # ----------------------------------------------------------------------------
  

Modified: trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,9 +1,9 @@
 Provide a special helper script to start dicomscope
 
-Index: b/dicomscope
+Index: dicomscope-3.6.0/dicomscope
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/dicomscope	2011-02-09 10:49:26.000000000 +0100
++++ dicomscope-3.6.0/dicomscope	2011-06-15 01:17:32.000000000 +0200
 @@ -0,0 +1,3 @@
 +#!/bin/sh
 +

Modified: trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,9 +1,9 @@
 The MANIFEST.MF provides does not work on case sensitive system. Fix it.
 
-Index: b/MANIFEST.MF
+Index: dicomscope-3.6.0/MANIFEST.MF
 ===================================================================
---- a/MANIFEST.MF	2011-02-09 10:49:19.000000000 +0100
-+++ b/MANIFEST.MF	2011-02-09 10:49:25.000000000 +0100
+--- dicomscope-3.6.0.orig/MANIFEST.MF	2011-06-15 01:16:12.000000000 +0200
++++ dicomscope-3.6.0/MANIFEST.MF	2011-06-15 01:17:23.000000000 +0200
 @@ -1,2 +1,2 @@
  Manifest-Version: 1.0
 -Main-Class: DICOMscope/DICOMscope

Modified: trunk/packages/dicomscope/trunk/debian/patches/iso2utf8.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/iso2utf8.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/iso2utf8.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,7 +1,7 @@
 Index: dicomscope-3.6.0/tkgui/DICOMscope.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/DICOMscope.java	2011-02-09 11:02:13.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/DICOMscope.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/DICOMscope.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/DICOMscope.java	2011-06-15 01:17:03.000000000 +0200
 @@ -230,7 +230,7 @@
          		    
              Dimension d = getSize();
@@ -13,8 +13,8 @@
                  if (d.height < 1500) d.height = 1500;
 Index: dicomscope-3.6.0/tkgui/J2Ci/jBooleanByRef.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jBooleanByRef.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jBooleanByRef.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jBooleanByRef.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jBooleanByRef.java	2011-06-15 01:17:03.000000000 +0200
 @@ -32,7 +32,7 @@
  /** 
   * The class <em>jBooleanByRef</em> manages the "variable-by-reference".
@@ -26,8 +26,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVIFhierarchyStatus.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVIFhierarchyStatus.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVIFhierarchyStatus.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVIFhierarchyStatus.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVIFhierarchyStatus.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVIFhierarchyStatus</em> represents the C++-enumeration
   * DVIFhierarchyStatus.
@@ -39,8 +39,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurve.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSCurve.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurve.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSCurve.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurve.java	2011-06-15 01:17:03.000000000 +0200
 @@ -34,7 +34,7 @@
   * A <em>jDVPSCurve</em> is the Java-sided class for the C++-Class
   * DVPSCurve.
@@ -52,8 +52,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurveType.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSCurveType.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurveType.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSCurveType.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurveType.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSCurveType</em> represents the C++-enumeration
   * DVPSCurveType.
@@ -65,8 +65,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSDecimateCropBehaviour</em> represents the C++-enumeration
   * DVPSDecimateCropBehaviour.
@@ -78,8 +78,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSDisplayTransform.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSDisplayTransform.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSDisplayTransform.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSDisplayTransform.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSDisplayTransform.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSDisplayTransform</em> represents the C++-enumeration
   * DVPSDisplayTransform.
@@ -91,8 +91,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSFilmOrientation.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSFilmOrientation.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSFilmOrientation.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSFilmOrientation.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSFilmOrientation.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSFilmOrientation</em> represents the C++-enumeration
   * DVPSFilmOrientation.
@@ -104,8 +104,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicObject.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSGraphicObject.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicObject.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSGraphicObject.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicObject.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * A <em>jDVPSGraphicObject</em> is the Java-sided class for the C++-Class
   * DVPSGraphicObject.
@@ -117,8 +117,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicType.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSGraphicType.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicType.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSGraphicType.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicType.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSGraphicType</em> represents the C++-enumeration
   * DVPSGraphicType.
@@ -130,8 +130,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSObjectApplicability.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSObjectApplicability.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSObjectApplicability.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSObjectApplicability.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSObjectApplicability.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSObjectApplicability</em> represents the C++-enumeration
   * DVPSObjectApplicability.
@@ -143,8 +143,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSPresentationSizeMode.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSPresentationSizeMode.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSPresentationSizeMode.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSPresentationSizeMode.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSPresentationSizeMode.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSPresentationSizeMode</em> represents the C++-enumeration
   * DVPSPresentationSizeMode.
@@ -156,8 +156,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSPrintPresentationLUTType</em> represents the C++-enumeration
   * jDVPSPrintPresentationLUTType.
@@ -169,8 +169,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSRotationType.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSRotationType.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSRotationType.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSRotationType.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSRotationType.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSRotationType</em> represents the C++-enumeration
   * DVPSRotationType.
@@ -182,8 +182,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSShutterType.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSShutterType.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSShutterType.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSShutterType.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSShutterType.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSShutterType</em> represents the C++-enumeration
   * DVPSShutterType.
@@ -195,8 +195,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextJustification.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTextJustification.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextJustification.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTextJustification.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextJustification.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSTextJustification</em> represents the C++-enumeration
   * DVPSTextJustification.
@@ -208,8 +208,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextObject.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTextObject.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextObject.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTextObject.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextObject.java	2011-06-15 01:17:03.000000000 +0200
 @@ -34,7 +34,7 @@
   * A <em>jDVPSTextObject</em> is the Java-sided class for the C++-Class
   * DVPSTextObject.
@@ -221,8 +221,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSTrimMode.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTrimMode.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTrimMode.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTrimMode.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTrimMode.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSTrimMode</em> represents the C++-enumeration
   * DVPSTrimMode.
@@ -234,8 +234,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSannotationUnit.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSannotationUnit.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSannotationUnit.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSannotationUnit.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSannotationUnit.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPSannotationUnit</em> represents the C++-enumeration
   * DVPSannotationUnit.
@@ -247,8 +247,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPScharacterSet.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPScharacterSet.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPScharacterSet.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPScharacterSet.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPScharacterSet.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jE_Condition</em> represents the C++-enumeration
   * E_Condition.
@@ -260,8 +260,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java	2011-06-15 01:17:03.000000000 +0200
 @@ -36,7 +36,7 @@
   * and what Java can't manage. So an extra class had to be constructed - this class.
   * Create an object of this class before passing it to that method!
@@ -273,8 +273,8 @@
  {   
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java	2011-06-15 01:17:03.000000000 +0200
 @@ -37,7 +37,7 @@
   * Create an object of this class before passing it to that method!
   * IN and OUT specifies the type of param (input param or output param).
@@ -286,8 +286,8 @@
  {   
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java	2011-06-15 01:17:03.000000000 +0200
 @@ -36,7 +36,7 @@
   * and what Java can't manage. So an extra class had to be constructed - this class.
   * Create an object of this class before passing it to that method!
@@ -299,8 +299,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDVPrStateParam_GetScreenData</em> is responsible for parameters
   * passed to the method getScreenData().
@@ -312,8 +312,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jDoubleByRef.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDoubleByRef.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDoubleByRef.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDoubleByRef.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jDoubleByRef.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jDoublebyRef</em> manages the "variable-by-reference".
   *
@@ -325,8 +325,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jE_Condition.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jE_Condition.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jE_Condition.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jE_Condition.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jE_Condition.java	2011-06-15 01:17:03.000000000 +0200
 @@ -42,7 +42,7 @@
   * return value of OFCondition::status() which might be OF_ok,
   * OF_error or OF_failure.
@@ -338,8 +338,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jIntByRef.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jIntByRef.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jIntByRef.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jIntByRef.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jIntByRef.java	2011-06-15 01:17:03.000000000 +0200
 @@ -32,7 +32,7 @@
  /** 
   * The class <em>jIntbyRef</em> manages the "variable-by-reference".
@@ -351,8 +351,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jRGB.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jRGB.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jRGB.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jRGB.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jRGB.java	2011-06-15 01:17:03.000000000 +0200
 @@ -32,7 +32,7 @@
  /** 
   * The class <em>jRGB</em> represents a RGB-color value.
@@ -364,8 +364,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/J2Ci/jStringByRef.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jStringByRef.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/J2Ci/jStringByRef.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/J2Ci/jStringByRef.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/J2Ci/jStringByRef.java	2011-06-15 01:17:03.000000000 +0200
 @@ -33,7 +33,7 @@
   * The class <em>jStringByRef</em> manages the "variable-by-reference".
   *
@@ -377,8 +377,8 @@
  {
 Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java	2011-06-15 01:17:03.000000000 +0200
 @@ -38,8 +38,8 @@
  * A string of characters with leading or trailing
  * spaces (20H) being non-significant.
@@ -403,8 +403,8 @@
      * Inserting content causes a write lock to be held while the actual changes are taking place, 
 Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java	2011-06-15 01:17:03.000000000 +0200
 @@ -40,7 +40,7 @@
  * contain the month, and dd shall contain the
  * day. This conforms to the ANSI HISPP MSDSDate common data type.
@@ -416,8 +416,8 @@
  * compatibility with versions of this
 Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java	2011-06-15 01:17:03.000000000 +0200
 @@ -46,7 +46,7 @@
  * Strings may be padded with leading or trailing
  * spaces. Embedded spaces are not allowed.
@@ -429,8 +429,8 @@
  * @author Klaus Kleber
 Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java	2011-06-15 01:17:03.000000000 +0200
 @@ -41,7 +41,7 @@
  * trailing spaces. Embedded spaces are not allowed.
  * <p>
@@ -453,8 +453,8 @@
      * Inserting content causes a write lock to be held while the actual changes are taking place, 
 Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java	2011-06-15 01:17:03.000000000 +0200
 @@ -35,7 +35,7 @@
  * Contains a document for DICOM Long String (SH) values.
  * A character string that may be padded with
@@ -466,8 +466,8 @@
  * elements. The string shall not have Control
 Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java	2011-02-09 11:02:14.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java	2011-06-15 01:17:03.000000000 +0200
 @@ -41,27 +41,27 @@
  * "59"), ss contains seconds (range "00" -
  * "59"), and frac contains a fractional part of a
@@ -504,8 +504,8 @@
  * compatibility with versions of this
 Index: dicomscope-3.6.0/tkgui/dicomPrint/PrintPanel.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/dicomPrint/PrintPanel.java	2011-02-09 11:02:13.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/dicomPrint/PrintPanel.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/dicomPrint/PrintPanel.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/dicomPrint/PrintPanel.java	2011-06-15 01:17:03.000000000 +0200
 @@ -361,7 +361,7 @@
          }
          
@@ -517,8 +517,8 @@
              
 Index: dicomscope-3.6.0/tkgui/dicomscope/DICOMscope.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/dicomscope/DICOMscope.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/dicomscope/DICOMscope.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/dicomscope/DICOMscope.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/dicomscope/DICOMscope.java	2011-06-15 01:17:03.000000000 +0200
 @@ -218,7 +218,7 @@
              
              Dimension d = getSize();
@@ -530,8 +530,8 @@
                  if (d.height < 1500) d.height = 1500;
 Index: dicomscope-3.6.0/tkgui/processCommunication/ProcessTable.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/processCommunication/ProcessTable.java	2011-02-09 11:02:15.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/processCommunication/ProcessTable.java	2011-02-09 11:02:10.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/processCommunication/ProcessTable.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/processCommunication/ProcessTable.java	2011-06-15 01:17:03.000000000 +0200
 @@ -67,7 +67,7 @@
  	
          
@@ -552,8 +552,8 @@
                      
 Index: dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicLayer.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateGraphicLayer.java	2011-02-09 11:02:13.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicLayer.java	2011-02-09 11:02:09.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateGraphicLayer.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicLayer.java	2011-06-15 01:17:03.000000000 +0200
 @@ -456,7 +456,7 @@
              PresentationStateLayerObject delLayerObject = ((PresentationStateLayerObject)listPresentationStateObject.elementAt(deleteIndex));
              System.out.println("deleteIndex: " + deleteIndex);
@@ -565,8 +565,8 @@
              
 Index: dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java	2011-02-09 11:02:13.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java	2011-02-09 11:02:09.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java	2011-06-15 01:17:03.000000000 +0200
 @@ -1371,7 +1371,7 @@
       */
      public void updatePresentationState() {
@@ -578,8 +578,8 @@
          setScreenSize(screenSize);
 Index: dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateTextObject.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateTextObject.java	2011-02-09 11:02:13.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateTextObject.java	2011-02-09 11:02:09.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateTextObject.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateTextObject.java	2011-06-15 01:17:03.000000000 +0200
 @@ -71,7 +71,7 @@
      int needRot = -1;
      int rot = 0;
@@ -604,8 +604,8 @@
      /**
 Index: dicomscope-3.6.0/tkgui/viewer/sr/VerificationDialog.java
 ===================================================================
---- dicomscope-3.6.0.orig/tkgui/viewer/sr/VerificationDialog.java	2011-02-09 11:02:13.000000000 +0100
-+++ dicomscope-3.6.0/tkgui/viewer/sr/VerificationDialog.java	2011-02-09 11:02:09.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/viewer/sr/VerificationDialog.java	2011-06-15 01:16:13.000000000 +0200
++++ dicomscope-3.6.0/tkgui/viewer/sr/VerificationDialog.java	2011-06-15 01:17:03.000000000 +0200
 @@ -151,7 +151,7 @@
  
  

Modified: trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,8 +1,8 @@
 This patch simply remove the call to the old API for logging until a better fix is to be found
-Index: b/interface/libsrc/DVInterface.cpp
+Index: dicomscope-3.6.0/interface/libsrc/DVInterface.cpp
 ===================================================================
---- a/interface/libsrc/DVInterface.cpp	2011-02-09 10:49:19.000000000 +0100
-+++ b/interface/libsrc/DVInterface.cpp	2011-02-09 10:49:27.000000000 +0100
+--- dicomscope-3.6.0.orig/interface/libsrc/DVInterface.cpp	2011-06-15 01:16:05.000000000 +0200
++++ dicomscope-3.6.0/interface/libsrc/DVInterface.cpp	2011-06-15 01:17:58.000000000 +0200
 @@ -2828,7 +2828,7 @@
  {
      DVInterface *dvi = getAddressOfDVInterface (env, obj);

Modified: trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch	2011-06-14 17:31:48 UTC (rev 7020)
+++ trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch	2011-06-14 21:21:31 UTC (rev 7021)
@@ -1,9 +1,9 @@
 Use full path instead of relative path
 
-Index: b/tkgui/main/MainContext.java
+Index: dicomscope-3.6.0/tkgui/main/MainContext.java
 ===================================================================
---- a/tkgui/main/MainContext.java	2011-02-09 10:49:19.000000000 +0100
-+++ b/tkgui/main/MainContext.java	2011-02-09 10:49:26.000000000 +0100
+--- dicomscope-3.6.0.orig/tkgui/main/MainContext.java	2011-06-15 01:16:10.000000000 +0200
++++ dicomscope-3.6.0/tkgui/main/MainContext.java	2011-06-15 01:17:30.000000000 +0200
 @@ -148,7 +148,7 @@
          //System.out.println("MainContext.iconPath " +MainContext.iconPath );
          //Load deviceColorModell

More information about the debian-med-commit mailing list