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

Sun Jun 25 06:09:46 UTC 2017

Author: gewo
Date: 2017-06-25 06:09:45 +0000 (Sun, 25 Jun 2017)
New Revision: 23859

Added:
   trunk/packages/dicomscope/trunk/debian/patches/correct_include.patch
Modified:
   trunk/packages/dicomscope/trunk/debian/changelog
   trunk/packages/dicomscope/trunk/debian/control
   trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
   trunk/packages/dicomscope/trunk/debian/patches/series
Log:
Correct for new dcmtk version, closes #865783

Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================

--- trunk/packages/dicomscope/trunk/debian/changelog	2017-06-25 06:01:24 UTC (rev 23858)
+++ trunk/packages/dicomscope/trunk/debian/changelog	2017-06-25 06:09:45 UTC (rev 23859)
@@ -1,9 +1,15 @@
-dicomscope (3.6.0-16) UNRELEASED; urgency=medium
+dicomscope (3.6.0-16) unstable; urgency=medium
 
+  [ Mathieu Malaterre ]
   * Remove self from Uploaders
 
- -- Mathieu Malaterre <malat at debian.org>  Mon, 20 Feb 2017 13:21:22 +0100
+  [ Gert Wollny ]
+  * d/p/cmake.. Correct macros for new version Closes: #865783
+  * d/p/correct_includes: Use full dcmtk sub-path for includes 
+  * d/control: correct my email address
 
+ -- Gert Wollny <gewo at debian.org>  Sun, 25 Jun 2017 06:06:11 +0000
+
 dicomscope (3.6.0-15) unstable; urgency=medium
 
   * update build dependency to libdicom-dev (Closes: #804569)

Modified: trunk/packages/dicomscope/trunk/debian/control
===================================================================
--- trunk/packages/dicomscope/trunk/debian/control	2017-06-25 06:01:24 UTC (rev 23858)
+++ trunk/packages/dicomscope/trunk/debian/control	2017-06-25 06:09:45 UTC (rev 23859)
@@ -1,7 +1,7 @@
 Source: dicomscope
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>, 
-           Gert Wollny <gw.fossdev at gmail.com> 
+           Gert Wollny <gewo at debian.org> 
 Section: graphics
 Priority: optional
 Build-Depends: debhelper (>= 9),

Modified: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2017-06-25 06:01:24 UTC (rev 23858)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2017-06-25 06:09:45 UTC (rev 23859)
@@ -3,10 +3,8 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: not-needed
 
-Index: dicomscope-3.6.0/CMakeLists.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/CMakeLists.txt	2013-11-06 13:58:16.000000000 +0100
+--- /dev/null
++++ b/CMakeLists.txt
 @@ -0,0 +1,25 @@
 +cmake_minimum_required(VERSION 2.8.2)
 +project(DICOMSCOPE)
@@ -33,11 +31,9 @@
 +
 +add_subdirectory(interface/libsrc)
 +add_subdirectory(tkgui)
-Index: dicomscope-3.6.0/interface/libsrc/CMakeLists.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt	2013-11-06 14:13:11.000000000 +0100
-@@ -0,0 +1,55 @@
+--- /dev/null
++++ b/interface/libsrc/CMakeLists.txt
+@@ -0,0 +1,52 @@
 +set(dsgui_SRCS
 +  DSRCodeValue.cpp
 +  DSRCompositeValue.cpp
@@ -63,18 +59,15 @@
 +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
++  ${DCMTK_INCLUDE_DIR}/dcmtk/dcmpstat
 +)
 +# /usr/include/dcmtk/dcmjpeg/djdecode.h
 +find_path( DCMTK_dcmjpeg_INCLUDE_DIR djdecode.h
-+  ${DCMTK_DIR}/dcmjpeg/include
-+  ${DCMTK_DIR}/include/dcmjpeg
++  ${DCMTK_INCLUDE_DIR}/dcmtk/dcmjpeg
 +)
 +# /usr/include/dcmtk/dcmsr/dsrdoc.h
 +find_path(DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h
-+  ${DCMTK_DIR}/dcmsr/include
-+  ${DCMTK_DIR}/include/dcmsr
++  ${DCMTK_INCLUDE_DIR}/dcmtk/dcmsr
 +)
 +
 +include_directories(
@@ -93,10 +86,8 @@
 +  LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime
 +  ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development
 +)
-Index: dicomscope-3.6.0/tkgui/CMakeLists.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/tkgui/CMakeLists.txt	2013-11-06 13:58:16.000000000 +0100
+--- /dev/null
++++ b/tkgui/CMakeLists.txt
 @@ -0,0 +1,45 @@
 +# Java
 +find_package(Java REQUIRED) # javac, jar

Added: trunk/packages/dicomscope/trunk/debian/patches/correct_include.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/correct_include.patch	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/patches/correct_include.patch	2017-06-25 06:09:45 UTC (rev 23859)
@@ -0,0 +1,38 @@
+--- a/interface/include/jInterface.h
++++ b/interface/include/jInterface.h
+@@ -38,9 +38,9 @@
+ // Common Header-File
+ 
+ #include "errno.h"
+-#include "osconfig.h"
++#include "dcmtk/config/osconfig.h"
+ #include "dviface.h"	// DVInterface, DVPresentationState
+-#include "dcmimage.h"	// DicomImage
++#include "dcmtk/dcmimgle/dcmimage.h"	// DicomImage
+ #include "dvpstx.h"		// DVPSTextObject
+ #include "dvpsgr.h"		// DVPSGraphicObject
+ #include "dvpscu.h"		// DVPSCurve
+--- a/interface/libsrc/DSRDocument.cpp
++++ b/interface/libsrc/DSRDocument.cpp
+@@ -38,7 +38,7 @@
+ #include "J2Ci_jDSRDocument.h"
+ #include "jInterface.h"
+ 
+-#include "ofstream.h"
++#include "dcmtk/ofstd/ofstream.h"
+ 
+ 
+ static inline DSRDocument *getAddressOfDSRDocument (JNIEnv *env, jobject obj)
+--- a/interface/libsrc/DVInterface.cpp
++++ b/interface/libsrc/DVInterface.cpp
+@@ -41,8 +41,8 @@
+ 
+ #include "jInterface.h"
+ 
+-#include "dcrledrg.h"      /* for DcmRLEDecoderRegistration */
+-#include "djdecode.h"      /* for dcmjpeg decoders */
++#include "dcmtk/dcmdata/dcrledrg.h"      /* for DcmRLEDecoderRegistration */
++#include "dcmtk/dcmjpeg/djdecode.h"      /* for dcmjpeg decoders */
+ 
+ 
+ // ------------------- accessing C++-Objects

Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series	2017-06-25 06:01:24 UTC (rev 23858)
+++ trunk/packages/dicomscope/trunk/debian/patches/series	2017-06-25 06:09:45 UTC (rev 23859)
@@ -4,3 +4,4 @@
 DSRDocument.cpp.patch
 cmakelists.txt.patch
 correct_status_returns.patch
+correct_include.patch


