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

Mathieu Malaterre malat-guest at alioth.debian.org
Wed Feb 9 09:50:28 UTC 2011 

Author: malat-guest
Date: 2011-02-09 09:50:28 +0000 (Wed, 09 Feb 2011)
New Revision: 5935

Added:
   trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch
Removed:
   trunk/packages/dicomscope/trunk/debian/iconv-inplace.sh
Modified:
   trunk/packages/dicomscope/trunk/debian/changelog
   trunk/packages/dicomscope/trunk/debian/control
   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/maincontext.java.patch
   trunk/packages/dicomscope/trunk/debian/patches/series
   trunk/packages/dicomscope/trunk/debian/rules
Log:
Getting dicomscope to work against dcmtk 3.6.0

Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog	2011-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/changelog	2011-02-09 09:50:28 UTC (rev 5935)
@@ -1,3 +1,10 @@
+dicomscope (3.6.0-3) unstable; urgency=low
+
+  * Fix compilation of dicomscope against dcmtk 3.6.0 release and new API
+  * Update debian Standard Version to 3.9.1 no change needed
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 09 Feb 2011 10:47:44 +0100
+
 dicomscope (3.6.0-2) unstable; urgency=low
 
   * Remove tofrodos and unzip from Build-Deps. Fixes hurd-386 compilation. 

Modified: trunk/packages/dicomscope/trunk/debian/control
===================================================================
--- trunk/packages/dicomscope/trunk/debian/control	2011-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/control	2011-02-09 09:50:28 UTC (rev 5935)
@@ -4,16 +4,16 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Priority: extra
-Build-Depends: debhelper (>= 7), cmake, libdcmtk1-dev (>= 3.5.4), default-jdk,
+Build-Depends: debhelper (>= 7), cmake, libdcmtk2-dev (>= 3.6.0), default-jdk,
  libssl-dev, libxml2-dev, quilt
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dicomscope/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dicomscope/trunk/
 Homepage: http://dicom.offis.de/dscope.php.en
 
 Package: dicomscope
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.3 | tk8.4, libdcmtk1 (>= 3.5.4), libssl0.9.8,
+Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.3 | tk8.4, libdcmtk2 (>= 3.6.0), libssl0.9.8,
  libxml2, java-gcj-compat | java1-runtime | java2-runtime
 Description: The OFFIS DICOM Viewer
  DICOMscope is a free DICOM viewer which can display uncompressed,

Deleted: trunk/packages/dicomscope/trunk/debian/iconv-inplace.sh
===================================================================
--- trunk/packages/dicomscope/trunk/debian/iconv-inplace.sh	2011-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/iconv-inplace.sh	2011-02-09 09:50:28 UTC (rev 5935)
@@ -1,5 +0,0 @@
-#!/bin/sh
-#find $(DEBIAN_SRC_DIR) -name *.java -exec iconv -f ISO-IR-197 -t UTF-8 {} \;
-in=$1
-iconv --from-code=ISO-IR-197 --to-code=UTF-8 $in > /tmp/dummy.utf8;
-mv /tmp/dummy.utf8 $in;

Modified: trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch	2011-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch	2011-02-09 09:50:28 UTC (rev 5935)
@@ -1,7 +1,9 @@
 This is undefined in the source (fix compilation)
 
---- dicomscope-3.6.0.old/interface/libsrc/DSRDocument.cpp	2009-08-08 13:07:21.000000000 +0200
-+++ dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp	2009-08-08 13:07:43.000000000 +0200
+Index: b/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
 @@ -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-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch	2011-02-09 09:50:28 UTC (rev 5935)
@@ -1,8 +1,10 @@
 Apparently the original package was compiled on 32bits and thus long and Sint32 
 could be interchanged
 
---- dicomscope-3.6.0.old/interface/libsrc/DVPresentationState.cpp	2009-01-12 11:16:36.000000000 +0100
-+++ dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp	2009-01-12 11:10:22.000000000 +0100
+Index: b/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
 @@ -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-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2011-02-09 09:50:28 UTC (rev 5935)
@@ -1,8 +1,10 @@
 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
+Index: b/CMakeLists.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/CMakeLists.txt	2011-02-09 10:49:25.000000000 +0100
 @@ -0,0 +1,24 @@
 +PROJECT(DICOMSCOPE)
 +
@@ -28,8 +30,10 @@
 +
 +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
+Index: b/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
 @@ -0,0 +1,60 @@
 +SET(dsgui_SRCS
 +DSRCodeValue.cpp
@@ -84,15 +88,17 @@
 +
 +#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 +ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
-+TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto)
++TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto oflog)
 +  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
+Index: b/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
 @@ -0,0 +1,43 @@
 +# Java
 +FIND_PACKAGE(Java REQUIRED) # javac, jar

Modified: trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch	2011-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch	2011-02-09 09:50:28 UTC (rev 5935)
@@ -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: dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp
+Index: b/interface/libsrc/DSRDocument.cpp
 ===================================================================
---- dicomscope-3.6.0.orig/interface/libsrc/DSRDocument.cpp	2011-02-04 12:10:23.000000000 +0100
-+++ dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp	2011-02-04 12:10:55.000000000 +0100
+--- 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
 @@ -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-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch	2011-02-09 09:50:28 UTC (rev 5935)
@@ -1,7 +1,9 @@
 Fix the default path to those as defined in debian packaging of dcmtk
 
---- dsgui360/DICOMscope/DICOMscope.cfg.orig	2009-01-08 12:50:39.675600000 +0100
-+++ dsgui360/DICOMscope/DICOMscope.cfg	2009-01-08 15:54:12.039628000 +0100
+Index: b/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
 @@ -157,15 +157,15 @@
  # ----------------------------------------------------------------------------
  
@@ -59,4 +61,3 @@
  
  # Maximum number of associations the server can handle at the same time.
  # This is only applicable on Unix platforms, since Windows does not support
-

Modified: trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch	2011-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch	2011-02-09 09:50:28 UTC (rev 5935)
@@ -1,7 +1,9 @@
 Provide a special helper script to start dicomscope
 
---- dsgui351/dicomscope	1970-01-01 01:00:00.000000000 +0100
-+++ dsgui360/dicomscope	2009-01-08 13:03:11.000000000 +0100
+Index: b/dicomscope
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/dicomscope	2011-02-09 10:49:26.000000000 +0100
 @@ -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-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch	2011-02-09 09:50:28 UTC (rev 5935)
@@ -1,7 +1,9 @@
 The MANIFEST.MF provides does not work on case sensitive system. Fix it.
 
---- dsgui360.orig/MANIFEST.MF	2009-01-07 18:31:07.557478000 +0100
-+++ dsgui360/MANIFEST.MF	2009-01-07 18:30:16.940809000 +0100
+Index: b/MANIFEST.MF
+===================================================================
+--- a/MANIFEST.MF	2011-02-09 10:49:19.000000000 +0100
++++ b/MANIFEST.MF	2011-02-09 10:49:25.000000000 +0100
 @@ -1,2 +1,2 @@
  Manifest-Version: 1.0
 -Main-Class: DICOMscope/DICOMscope

Added: trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch	2011-02-09 09:50:28 UTC (rev 5935)
@@ -0,0 +1,23 @@
+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
+===================================================================
+--- 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
+@@ -2828,7 +2828,7 @@
+ {
+     DVInterface *dvi = getAddressOfDVInterface (env, obj);
+ 
+-    dvi->setLogFilter ((DVPSLogMessageLevel)level);
++//    dvi->setLogFilter ((DVPSLogMessageLevel)level);
+ }
+ 
+ 
+@@ -2845,7 +2845,7 @@
+     char *mod = (char*) env->GetStringUTFChars (module, 0);
+     char *msg = (char*) env->GetStringUTFChars (message, 0);
+ 
+-    OFCondition res = dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg);
++    OFCondition res = EC_Normal; //dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg);
+ 
+     env->ReleaseStringUTFChars (module, mod);
+     env->ReleaseStringUTFChars (message, msg);

Modified: trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch	2011-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch	2011-02-09 09:50:28 UTC (rev 5935)
@@ -1,7 +1,9 @@
 Use full path instead of relative path
 
---- dsgui360/tkgui/main/MainContext.java.orig	2009-01-08 12:53:45.530106000 +0100
-+++ dsgui360/tkgui/main/MainContext.java	2009-01-08 12:54:00.689769000 +0100
+Index: b/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
 @@ -148,7 +148,7 @@
          //System.out.println("MainContext.iconPath " +MainContext.iconPath );
          //Load deviceColorModell

Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series	2011-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/patches/series	2011-02-09 09:50:28 UTC (rev 5935)
@@ -6,3 +6,5 @@
 dicomscope.patch
 DSRDocument.cpp.patch
 dicom_2009.patch
+log4cplus.patch
+iso2utf8.patch

Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules	2011-02-09 08:00:16 UTC (rev 5934)
+++ trunk/packages/dicomscope/trunk/debian/rules	2011-02-09 09:50:28 UTC (rev 5935)
@@ -141,7 +141,6 @@
 	# Need tofrodos in order to prepare the patch, since quilt
 	# does not support mixture of dos/unix EOL
 	find $(DEBIAN_SRC_DIR) -name *.java -exec dos2unix {} \;
-	#find $(DEBIAN_SRC_DIR) -name *.java -exec ./debian/iconv-inplace.sh {} \;
 	find $(DEBIAN_SRC_DIR) -name *.html -exec dos2unix {} \;
 	find $(DEBIAN_SRC_DIR) -name *.h -exec dos2unix {} \;
 	find $(DEBIAN_SRC_DIR) -name *.cpp -exec dos2unix {} \;

More information about the debian-med-commit mailing list