[med-svn] r9435 - in trunk/packages/ctk/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Thu Jan 26 09:07:34 UTC 2012
Author: malat-guest
Date: 2012-01-26 09:07:33 +0000 (Thu, 26 Jan 2012)
New Revision: 9435
Modified:
trunk/packages/ctk/trunk/debian/changelog
trunk/packages/ctk/trunk/debian/control
trunk/packages/ctk/trunk/debian/get-orig-source
trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-2
trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-3
trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch
trunk/packages/ctk/trunk/debian/patches/series
Log:
Giving commontk another shot
Modified: trunk/packages/ctk/trunk/debian/changelog
===================================================================
--- trunk/packages/ctk/trunk/debian/changelog 2012-01-25 13:45:27 UTC (rev 9434)
+++ trunk/packages/ctk/trunk/debian/changelog 2012-01-26 09:07:33 UTC (rev 9435)
@@ -1,4 +1,4 @@
-ctk (0.1.0~git20111103-1) UNRELEASED; urgency=low
+ctk (0.1.0~git20120125-1) UNRELEASED; urgency=low
* Use newer git commit, to allow building with DCMTK 3.6.0
- Build CTK/DICOM module
Modified: trunk/packages/ctk/trunk/debian/control
===================================================================
--- trunk/packages/ctk/trunk/debian/control 2012-01-25 13:45:27 UTC (rev 9434)
+++ trunk/packages/ctk/trunk/debian/control 2012-01-26 09:07:33 UTC (rev 9435)
@@ -3,14 +3,14 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), cmake (>= 2.8.2), cdbs, libqt4-dev,
+Build-Depends: debhelper (>= 8), cmake (>= 2.8.2), libqt4-dev,
libdcmtk2-dev, libinsighttoolkit3-dev, libgdcm2-dev, zlib1g-dev, libvtk5-dev,
libpythonqt2-dev, python-dev, binutils-dev, libwrap0-dev
Standards-Version: 3.9.2
Section: libs
Homepage: http://www.commontk.org/
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/ctk/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/ctk/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/ctk/trunk/
Package: libctk-dev
Section: libdevel
Modified: trunk/packages/ctk/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/ctk/trunk/debian/get-orig-source 2012-01-25 13:45:27 UTC (rev 9434)
+++ trunk/packages/ctk/trunk/debian/get-orig-source 2012-01-26 09:07:33 UTC (rev 9435)
@@ -11,9 +11,7 @@
fi
REVISION=`echo $VERSION | sed -e 's/^.*git//g'`
-#Date: Thu Nov 3 09:17:34 2011 -0400
-# Merge branch 'ctkvtkvolumepropertywidget-update-range'
-REVISION=764eebaf9683c102aab062b824323d0b962f1c64
+REVISION=c21e21ecdeba30ab00bc744a99b5d0bdabe54c8f
if [ -z ${TARFILE}]; then
TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
Modified: trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-2
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-2 2012-01-25 13:45:27 UTC (rev 9434)
+++ trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-2 2012-01-26 09:07:33 UTC (rev 9435)
@@ -24,10 +24,12 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- ctk-0.1.0.orig/CMakeLists.txt
-+++ ctk-0.1.0/CMakeLists.txt
-@@ -57,6 +57,8 @@ endif()
- PROJECT(CTK)
+Index: ctk-0.1.0~git20120125/CMakeLists.txt
+===================================================================
+--- ctk-0.1.0~git20120125.orig/CMakeLists.txt 2012-01-26 09:24:24.000000000 +0100
++++ ctk-0.1.0~git20120125/CMakeLists.txt 2012-01-26 09:25:00.000000000 +0100
+@@ -57,6 +57,8 @@
+ project(CTK)
#-----------------------------------------------------------------------------
+ADD_SUBDIRECTORY(Utilities/Log4Qt)
@@ -35,25 +37,3 @@
#-----------------------------------------------------------------------------
# Library mode: SHARED (default) or STATIC
#
-@@ -136,7 +138,7 @@ IF(NOT CTK_INSTALL_BIN_DIR)
- SET(CTK_INSTALL_BIN_DIR "bin")
- ENDIF()
- IF(NOT CTK_INSTALL_LIB_DIR)
-- SET(CTK_INSTALL_LIB_DIR "lib/ctk-${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}")
-+ SET(CTK_INSTALL_LIB_DIR "lib")
- ENDIF()
- IF(NOT CTK_INSTALL_INCLUDE_DIR)
- SET(CTK_INSTALL_INCLUDE_DIR "include/ctk-${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}")
---- ctk-0.1.0.orig/Libs/Core/CMakeLists.txt
-+++ ctk-0.1.0/Libs/Core/CMakeLists.txt
-@@ -3,7 +3,9 @@ PROJECT(CTKCore)
- #
- # 3rd party dependencies
- #
--INCLUDE(${Log4Qt_USE_FILE})
-+INCLUDE_DIRECTORIES(${Log4Qt_SOURCE_DIR}/src)
-+#LINK_DIRECTORIES(${Log4Qt_BINARY_DIR}/bin)
-+SET(Log4Qt_LIBRARIES ${Log4Qt_BINARY_DIR}/bin/libLog4Qt.a)
-
- # CMake modules
- SET(CMAKE_MODULE_PATH ${CTKCore_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH})
Modified: trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-3
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-3 2012-01-25 13:45:27 UTC (rev 9434)
+++ trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-3 2012-01-26 09:07:33 UTC (rev 9435)
@@ -26,31 +26,11 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: ctk-0.1.0~git622a40d/Libs/ImageProcessing/ITK/Core/target_libraries.cmake
+Index: ctk-0.1.0~git20120125/Libs/ImageProcessing/ITK/Core/CMakeLists.txt
===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/ImageProcessing/ITK/Core/target_libraries.cmake 2011-09-03 18:52:29.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/ImageProcessing/ITK/Core/target_libraries.cmake 2011-09-03 18:52:52.000000000 +0200
-@@ -5,6 +5,6 @@
- #
-
- SET(target_libraries
-- ITK_LIBRARIES
-+# ITK_LIBRARIES
- CTKCore
- )
-Index: ctk-0.1.0~git622a40d/Libs/ImageProcessing/ITK/Core/CMakeLists.txt
-===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/ImageProcessing/ITK/Core/CMakeLists.txt 2011-09-03 18:52:29.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/ImageProcessing/ITK/Core/CMakeLists.txt 2011-09-03 18:52:52.000000000 +0200
-@@ -3,6 +3,7 @@
- #
- # 3rd party dependencies
- #
-+FIND_PACKAGE(ITK REQUIRED)
- INCLUDE(${ITK_USE_FILE})
-
- #
-@@ -40,7 +41,7 @@
+--- ctk-0.1.0~git20120125.orig/Libs/ImageProcessing/ITK/Core/CMakeLists.txt 2012-01-26 09:24:25.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/ImageProcessing/ITK/Core/CMakeLists.txt 2012-01-26 09:25:08.000000000 +0100
+@@ -40,7 +40,7 @@
SRCS ${KIT_SRCS}
MOC_SRCS ${KIT_MOC_SRCS}
UI_FORMS ${KIT_UI_FORMS}
@@ -59,10 +39,10 @@
RESOURCES ${KIT_resources}
LIBRARY_TYPE ${CTK_LIBRARY_MODE}
)
-Index: ctk-0.1.0~git622a40d/Utilities/Log4Qt/CMakeLists.txt
+Index: ctk-0.1.0~git20120125/Utilities/Log4Qt/CMakeLists.txt
===================================================================
---- ctk-0.1.0~git622a40d.orig/Utilities/Log4Qt/CMakeLists.txt 2011-09-03 18:52:34.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Utilities/Log4Qt/CMakeLists.txt 2011-09-03 18:52:52.000000000 +0200
+--- ctk-0.1.0~git20120125.orig/Utilities/Log4Qt/CMakeLists.txt 2012-01-26 09:24:29.000000000 +0100
++++ ctk-0.1.0~git20120125/Utilities/Log4Qt/CMakeLists.txt 2012-01-26 09:25:08.000000000 +0100
@@ -18,7 +18,7 @@
#-----------------------------------------------------------------------------
# Library type - Statically built
Modified: trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch 2012-01-25 13:45:27 UTC (rev 9434)
+++ trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch 2012-01-26 09:07:33 UTC (rev 9435)
@@ -1,31 +1,10 @@
Taken from:
https://github.com/malaterre/CTK/commit/e06d661
This has not been pulled yet in upstream
-Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDatabase.cpp
+Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMDataset.cpp
===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMDatabase.cpp 2011-09-04 13:55:23.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDatabase.cpp 2011-09-04 13:55:28.000000000 +0200
-@@ -41,6 +41,7 @@
- #include "ctkLogger.h"
-
- // DCMTK includes
-+#define HAVE_CONFIG_H
- #include <dcmtk/dcmdata/dcfilefo.h>
- #include <dcmtk/dcmdata/dcfilefo.h>
- #include <dcmtk/dcmdata/dcdeftag.h>
-@@ -49,7 +50,7 @@
- #include <dcmtk/ofstd/ofstring.h>
- #include <dcmtk/ofstd/ofstd.h> /* for class OFStandard */
- #include <dcmtk/dcmdata/dcddirif.h> /* for class DicomDirInterface */
--#include <dcmimage.h>
-+#include <dcmtk/dcmimgle/dcmimage.h>
-
- #include <dcmtk/dcmjpeg/djdecode.h> /* for dcmjpeg decoders */
- #include <dcmtk/dcmjpeg/djencode.h> /* for dcmjpeg encoders */
-Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDataset.cpp
-===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMDataset.cpp 2011-09-04 13:55:23.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDataset.cpp 2011-09-04 13:55:28.000000000 +0200
+--- ctk-0.1.0~git20120125.orig/Libs/DICOM/Core/ctkDICOMDataset.cpp 2012-01-26 09:42:36.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMDataset.cpp 2012-01-26 09:42:38.000000000 +0100
@@ -21,9 +21,9 @@
#include "ctkDICOMDataset.h"
@@ -39,22 +18,22 @@
#include <stdexcept>
-Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMIndexer.cpp
+Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMIndexer.cpp
===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMIndexer.cpp 2011-09-04 13:55:23.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMIndexer.cpp 2011-09-04 13:55:28.000000000 +0200
-@@ -37,6 +37,7 @@
- #include "ctkDICOMAbstractThumbnailGenerator.h"
+--- ctk-0.1.0~git20120125.orig/Libs/DICOM/Core/ctkDICOMIndexer.cpp 2012-01-26 09:42:36.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMIndexer.cpp 2012-01-26 09:42:38.000000000 +0100
+@@ -38,6 +38,7 @@
+ #include "ctkDICOMIndexer.h"
// DCMTK includes
+#define HAVE_CONFIG_H
#include <dcmtk/dcmdata/dcfilefo.h>
#include <dcmtk/dcmdata/dcfilefo.h>
#include <dcmtk/dcmdata/dcdeftag.h>
-Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMQuery.cpp
+Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMQuery.cpp
===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMQuery.cpp 2011-09-04 13:55:23.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMQuery.cpp 2011-09-04 13:55:28.000000000 +0200
+--- ctk-0.1.0~git20120125.orig/Libs/DICOM/Core/ctkDICOMQuery.cpp 2012-01-26 09:42:36.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMQuery.cpp 2012-01-26 09:42:38.000000000 +0100
@@ -35,8 +35,9 @@
#include "ctkLogger.h"
@@ -67,11 +46,11 @@
#include <dcmtk/dcmdata/dcfilefo.h>
#include <dcmtk/dcmdata/dcfilefo.h>
-Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMRetrieve.cpp
+Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMRetrieve.cpp
===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMRetrieve.cpp 2011-09-04 13:55:23.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMRetrieve.cpp 2011-09-04 13:55:28.000000000 +0200
-@@ -37,8 +37,9 @@
+--- ctk-0.1.0~git20120125.orig/Libs/DICOM/Core/ctkDICOMRetrieve.cpp 2012-01-26 09:42:36.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMRetrieve.cpp 2012-01-26 09:42:38.000000000 +0100
+@@ -27,8 +27,9 @@
#include "ctkLogger.h"
// DCMTK includes
@@ -83,28 +62,12 @@
#include <dcmtk/dcmdata/dcfilefo.h>
#include <dcmtk/dcmdata/dcfilefo.h>
-@@ -167,6 +168,7 @@
-
- // Issue request
- logger.debug ( "Sending Move Request" );
-+#if 0
- MOVEResponses responses;
- T_ASC_PresentationContextID presID = scu.findPresentationContextID(UID_MOVEStudyRootQueryRetrieveInformationModel, "" /* don't care about transfer syntax */ );
- if (presID == 0)
-@@ -283,6 +285,7 @@
- // }
- // }
- // }
-+#endif
- return true;
- }
-
-Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/CMakeLists.txt
+Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/CMakeLists.txt
===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/CMakeLists.txt 2011-09-04 13:55:23.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/CMakeLists.txt 2011-09-04 13:55:28.000000000 +0200
-@@ -85,6 +85,9 @@
- CONFIGURE_FILE( Resources/dcmqrscp.cfg.in dcmqrscp.cfg )
+--- ctk-0.1.0~git20120125.orig/Libs/DICOM/Core/CMakeLists.txt 2012-01-26 09:42:36.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/DICOM/Core/CMakeLists.txt 2012-01-26 09:42:38.000000000 +0100
+@@ -72,6 +72,9 @@
+ configure_file( Resources/dcmqrscp.cfg.in dcmqrscp.cfg )
set (DCMQRSCP_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/dcmqrscp.cfg)
+find_package(DCMTK REQUIRED)
@@ -113,49 +76,10 @@
ctkMacroBuildLib(
NAME ${PROJECT_NAME}
EXPORT_DIRECTIVE ${KIT_export_directive}
-Index: ctk-0.1.0~git622a40d/Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt
+Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMDataset.h
===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt 2011-09-04 13:57:03.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt 2011-09-04 13:57:16.000000000 +0200
-@@ -20,6 +20,7 @@
-
- ADD_EXECUTABLE(${KIT}CppTests ${Tests})
- TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
-+TARGET_LINK_LIBRARIES(${KIT}CppTests -lxml2 -lssl -lcrypto -ldcmdsig -ltiff -ldcmnet -lwrap)
-
- SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt
-===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt 2011-09-04 13:58:22.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt 2011-09-04 14:02:59.000000000 +0200
-@@ -22,6 +22,7 @@
-
- ADD_EXECUTABLE(${KIT}CppTests ${Tests})
- TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
-+TARGET_LINK_LIBRARIES(${KIT}CppTests -lxml2 -lssl -lcrypto -ldcmdsig -ltiff -ldcmnet -lwrap -loflog)
-
- SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-
-Index: ctk-0.1.0~git622a40d/Libs/Scripting/Python/Core/CMakeLists.txt
-===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/Scripting/Python/Core/CMakeLists.txt 2011-09-04 14:04:07.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/Scripting/Python/Core/CMakeLists.txt 2011-09-04 14:06:31.000000000 +0200
-@@ -6,6 +6,10 @@
- IF(CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_VTK)
- INCLUDE(${VTK_USE_FILE})
- ENDIF()
-+include_directories(
-+ /usr/include/PythonQt
-+ /usr/include/python2.6/
-+ )
-
- #
- # See CTK/CMake/ctkMacroBuildLib.cmake for details
-Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDataset.h
-===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMDataset.h 2011-09-04 14:37:24.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDataset.h 2011-09-04 14:37:24.000000000 +0200
+--- ctk-0.1.0~git20120125.orig/Libs/DICOM/Core/ctkDICOMDataset.h 2012-01-26 09:42:36.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMDataset.h 2012-01-26 09:42:38.000000000 +0100
@@ -25,7 +25,8 @@
#include "ctkDICOMPersonName.h"
@@ -166,11 +90,11 @@
#include <QtCore>
-Index: ctk-0.1.0~git622a40d/Libs/Widgets/Testing/Cpp/CMakeLists.txt
+Index: ctk-0.1.0~git20120125/Libs/Widgets/Testing/Cpp/CMakeLists.txt
===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/Widgets/Testing/Cpp/CMakeLists.txt 2011-09-04 14:37:24.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/Widgets/Testing/Cpp/CMakeLists.txt 2011-09-04 14:37:24.000000000 +0200
-@@ -15,7 +15,7 @@
+--- ctk-0.1.0~git20120125.orig/Libs/Widgets/Testing/Cpp/CMakeLists.txt 2012-01-26 09:42:36.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/Widgets/Testing/Cpp/CMakeLists.txt 2012-01-26 09:42:38.000000000 +0100
+@@ -16,7 +16,7 @@
ctkCollapsibleButtonTest2.cpp
ctkCollapsibleGroupBoxTest1.cpp
ctkColorDialogTest1.cpp
@@ -179,10 +103,10 @@
ctkColorPickerButtonTest1.cpp
ctkComboBoxTest1.cpp
ctkCompleterTest1.cpp
-Index: ctk-0.1.0~git622a40d/Utilities/CMake/FindDCMTK.cmake
+Index: ctk-0.1.0~git20120125/Utilities/CMake/FindDCMTK.cmake
===================================================================
---- ctk-0.1.0~git622a40d.orig/Utilities/CMake/FindDCMTK.cmake 2011-09-04 14:37:24.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Utilities/CMake/FindDCMTK.cmake 2011-09-04 14:37:24.000000000 +0200
+--- ctk-0.1.0~git20120125.orig/Utilities/CMake/FindDCMTK.cmake 2012-01-26 09:42:36.000000000 +0100
++++ ctk-0.1.0~git20120125/Utilities/CMake/FindDCMTK.cmake 2012-01-26 09:42:38.000000000 +0100
@@ -1,7 +1,7 @@
# - find DCMTK libraries and applications
#
@@ -202,456 +126,28 @@
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
-@@ -28,338 +29,124 @@
- #
- # Written for VXL by Amitha Perera.
- # Upgraded for GDCM by Mathieu Malaterre.
--#
-+# Modified for EasyViz by Thomas Sondergaard.
-+#
-+
-+if(NOT DCMTK_FOUND AND NOT DCMTK_DIR)
-+ set(DCMTK_DIR
-+ "/usr/include/dcmtk/"
-+ CACHE
-+ PATH
-+ "Root of DCMTK source tree (optional).")
-+ mark_as_advanced(DCMTK_DIR)
-+endif()
-+
-+
-+foreach(lib
-+ dcmdata
-+ dcmimage
-+ dcmimgle
-+ dcmjpeg
-+ dcmnet
-+ dcmpstat
-+ dcmqrdb
-+ dcmsign
-+ dcmsr
-+ dcmtls
-+ ijg12
-+ ijg16
-+ ijg8
-+ ofstd)
-+
-+ find_library(DCMTK_${lib}_LIBRARY
-+ ${lib}
-+ PATHS
-+ ${DCMTK_DIR}/${lib}/libsrc
-+ ${DCMTK_DIR}/${lib}/libsrc/Release
-+ ${DCMTK_DIR}/${lib}/libsrc/Debug
-+ ${DCMTK_DIR}/${lib}/Release
-+ ${DCMTK_DIR}/${lib}/Debug
-+ ${DCMTK_DIR}/lib)
-+
-+ mark_as_advanced(DCMTK_${lib}_LIBRARY)
-+
-+ if(DCMTK_${lib}_LIBRARY)
-+ list(APPEND DCMTK_LIBRARIES ${DCMTK_${lib}_LIBRARY})
-+ endif()
-+
-+endforeach()
-+
-+
-+set(DCMTK_config_TEST_HEADER osconfig.h)
-+set(DCMTK_dcmdata_TEST_HEADER dctypes.h)
-+set(DCMTK_dcmimage_TEST_HEADER dicoimg.h)
-+set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h)
-+set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h)
-+set(DCMTK_dcmnet_TEST_HEADER assoc.h)
-+set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h)
-+set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h)
-+set(DCMTK_dcmsign_TEST_HEADER sicert.h)
-+set(DCMTK_dcmsr_TEST_HEADER dsrtree.h)
-+set(DCMTK_dcmtls_TEST_HEADER tlslayer.h)
-+set(DCMTK_ofstd_TEST_HEADER ofstdinc.h)
-+
-+foreach(dir
-+ config
-+ dcmdata
-+ dcmimage
-+ dcmimgle
-+ dcmjpeg
-+ dcmnet
-+ dcmpstat
-+ dcmqrdb
-+ dcmsign
-+ dcmsr
-+ dcmtls
-+ ofstd)
-+ find_path(DCMTK_${dir}_INCLUDE_DIR
-+ ${DCMTK_${dir}_TEST_HEADER}
-+ PATHS
-+ ${DCMTK_DIR}/${dir}/include
-+ ${DCMTK_DIR}/${dir}
-+ ${DCMTK_DIR}/include/${dir})
-+
-+ mark_as_advanced(DCMTK_${dir}_INCLUDE_DIR)
-+
-+ if(DCMTK_${dir}_INCLUDE_DIR)
-+ list(APPEND
-+ DCMTK_INCLUDE_DIRS
-+ ${DCMTK_${dir}_INCLUDE_DIR})
-+ endif()
-+endforeach()
-+
-+if(WIN32)
-+ list(APPEND DCMTK_LIBRARIES netapi32 wsock32)
-+endif()
+Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMDatabase.cpp
+===================================================================
+--- ctk-0.1.0~git20120125.orig/Libs/DICOM/Core/ctkDICOMDatabase.cpp 2012-01-26 09:42:58.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMDatabase.cpp 2012-01-26 09:43:37.000000000 +0100
+@@ -50,7 +50,7 @@
+ #include <dcmtk/ofstd/ofstring.h>
+ #include <dcmtk/ofstd/ofstd.h> /* for class OFStandard */
+ #include <dcmtk/dcmdata/dcddirif.h> /* for class DicomDirInterface */
+-#include <dcmimage.h>
++#include <dcmtk/dcmimgle/dcmimage.h>
--IF( NOT DCMTK_FOUND )
-- SET( DCMTK_DIR "/usr/include/dcmtk/"
-- CACHE PATH "Root of DCMTK source tree (optional)." )
-- MARK_AS_ADVANCED( DCMTK_DIR )
--ENDIF( NOT DCMTK_FOUND )
--
--FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
-- PATHS
-- ${DCMTK_DIR}/config/include
-- ${DCMTK_DIR}/config
-- ${DCMTK_DIR}/include/dcmtk/config
-- ${DCMTK_DIR}/include
-- NO_DEFAULT_PATH
--
--)
--
--FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
-- PATHS
-- ${DCMTK_DIR}/ofstd/include
-- ${DCMTK_DIR}/ofstd
-- ${DCMTK_DIR}/include/ofstd
-- ${DCMTK_DIR}/include/dcmtk/ofstd
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
-- PATHS
-- ${DCMTK_DIR}/ofstd/libsrc
-- ${DCMTK_DIR}/ofstd/libsrc/Release
-- ${DCMTK_DIR}/ofstd/libsrc/Debug
-- ${DCMTK_DIR}/ofstd/Release
-- ${DCMTK_DIR}/ofstd/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--FIND_PATH( DCMTK_oflog_INCLUDE_DIR logger.h
-- PATHS
-- ${DCMTK_DIR}/oflog/include
-- ${DCMTK_DIR}/oflog
-- ${DCMTK_DIR}/include/oflog
-- ${DCMTK_DIR}/include/dcmtk/oflog
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_oflog_LIBRARY oflog
-- PATHS
-- ${DCMTK_DIR}/oflog/libsrc
-- ${DCMTK_DIR}/oflog/libsrc/Release
-- ${DCMTK_DIR}/oflog/libsrc/Debug
-- ${DCMTK_DIR}/oflog/Release
-- ${DCMTK_DIR}/oflog/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--
--
--FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
-- PATHS
-- ${DCMTK_DIR}/include/dcmdata
-- ${DCMTK_DIR}/include/dcmtk/dcmdata
-- ${DCMTK_DIR}/dcmdata
-- ${DCMTK_DIR}/dcmdata/include
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
-- PATHS
-- ${DCMTK_DIR}/dcmdata/libsrc
-- ${DCMTK_DIR}/dcmdata/libsrc/Release
-- ${DCMTK_DIR}/dcmdata/libsrc/Debug
-- ${DCMTK_DIR}/dcmdata/Release
-- ${DCMTK_DIR}/dcmdata/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--FIND_PATH( DCMTK_dcmjpeg_INCLUDE_DIR djdecode.h
-- PATHS
-- ${DCMTK_DIR}/include/dcmjpeg
-- ${DCMTK_DIR}/include/dcmtk/dcmjpeg
-- ${DCMTK_DIR}/dcmjpeg
-- ${DCMTK_DIR}/dcmjpeg/include
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_dcmjpeg_LIBRARY dcmjpeg
-- PATHS
-- ${DCMTK_DIR}/dcmjpeg/libsrc
-- ${DCMTK_DIR}/dcmjpeg/libsrc/Release
-- ${DCMTK_DIR}/dcmjpeg/libsrc/Debug
-- ${DCMTK_DIR}/dcmjpeg/Release
-- ${DCMTK_DIR}/dcmjpeg/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_ijg12_LIBRARY ijg12
-- PATHS
-- ${DCMTK_DIR}/dcmjpeg/libsrc
-- ${DCMTK_DIR}/dcmjpeg/libsrc/Release
-- ${DCMTK_DIR}/dcmjpeg/libsrc/Debug
-- ${DCMTK_DIR}/dcmjpeg/Release
-- ${DCMTK_DIR}/dcmjpeg/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_ijg16_LIBRARY ijg16
-- PATHS
-- ${DCMTK_DIR}/dcmjpeg/libsrc
-- ${DCMTK_DIR}/dcmjpeg/libsrc/Release
-- ${DCMTK_DIR}/dcmjpeg/libsrc/Debug
-- ${DCMTK_DIR}/dcmjpeg/Release
-- ${DCMTK_DIR}/dcmjpeg/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_ijg8_LIBRARY ijg8
-- PATHS
-- ${DCMTK_DIR}/dcmjpeg/libsrc
-- ${DCMTK_DIR}/dcmjpeg/libsrc/Release
-- ${DCMTK_DIR}/dcmjpeg/libsrc/Debug
-- ${DCMTK_DIR}/dcmjpeg/Release
-- ${DCMTK_DIR}/dcmjpeg/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--FIND_PATH( DCMTK_dcmnet_INCLUDE_DIR dimse.h
-- PATHS
-- ${DCMTK_DIR}/include/dcmnet
-- ${DCMTK_DIR}/include/dcmtk/dcmnet
-- ${DCMTK_DIR}/dcmnet
-- ${DCMTK_DIR}/dcmnet/include
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_dcmnet_LIBRARY dcmnet
-- PATHS
-- ${DCMTK_DIR}/dcmnet/libsrc
-- ${DCMTK_DIR}/dcmnet/libsrc/Release
-- ${DCMTK_DIR}/dcmnet/libsrc/Debug
-- ${DCMTK_DIR}/dcmnet/Release
-- ${DCMTK_DIR}/dcmnet/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
-- PATHS
-- ${DCMTK_DIR}/dcmimgle/include
-- ${DCMTK_DIR}/dcmimgle
-- ${DCMTK_DIR}/include/dcmimgle
-- ${DCMTK_DIR}/include/dcmtk/dcmimgle
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
-- PATHS
-- ${DCMTK_DIR}/dcmimgle/libsrc
-- ${DCMTK_DIR}/dcmimgle/libsrc/Release
-- ${DCMTK_DIR}/dcmimgle/libsrc/Debug
-- ${DCMTK_DIR}/dcmimgle/Release
-- ${DCMTK_DIR}/dcmimgle/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--FIND_PATH( DCMTK_dcmimage_INCLUDE_DIR diregist.h
-- PATHS
-- ${DCMTK_DIR}/dcmimage/include
-- ${DCMTK_DIR}/dcmimage
-- ${DCMTK_DIR}/include/dcmimage
-- ${DCMTK_DIR}/include/dcmtk/dcmimage
-- NO_DEFAULT_PATH
--)
--
--FIND_LIBRARY( DCMTK_dcmimage_LIBRARY dcmimage
-- PATHS
-- ${DCMTK_DIR}/dcmimage/libsrc
-- ${DCMTK_DIR}/dcmimage/libsrc/Release
-- ${DCMTK_DIR}/dcmimage/libsrc/Debug
-- ${DCMTK_DIR}/dcmimage/Release
-- ${DCMTK_DIR}/dcmimage/Debug
-- ${DCMTK_DIR}/lib
-- NO_DEFAULT_PATH
--)
--
--# MM: I could not find this library on debian system / dcmtk 3.5.4
--# Michael Onken: this module is now called dcmqrdb. I will re-work that script soon...
--FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
-- PATHS
-- ${DCMTK_DIR}/imagectn/libsrc/Release
-- ${DCMTK_DIR}/imagectn/libsrc/
-- ${DCMTK_DIR}/imagectn/libsrc/Debug
-- NO_DEFAULT_PATH
-- )
--
--IF( DCMTK_config_INCLUDE_DIR
-- AND DCMTK_ofstd_INCLUDE_DIR
-- AND DCMTK_ofstd_LIBRARY
-- AND DCMTK_oflog_INCLUDE_DIR
-- AND DCMTK_oflog_LIBRARY
-- AND DCMTK_dcmdata_INCLUDE_DIR
-- AND DCMTK_dcmdata_LIBRARY
-- AND DCMTK_dcmjpeg_INCLUDE_DIR
-- AND DCMTK_dcmjpeg_LIBRARY
-- AND DCMTK_dcmnet_INCLUDE_DIR
-- AND DCMTK_dcmnet_LIBRARY
-- AND DCMTK_dcmimgle_INCLUDE_DIR
-- AND DCMTK_dcmimgle_LIBRARY
-- AND DCMTK_dcmimage_INCLUDE_DIR
-- AND DCMTK_dcmimage_LIBRARY)
--
--# # Wrap library is required on Linux
--# IF(NOT WIN32)
--# FIND_LIBRARY(DCMTK_wrap_LIBRARY wrap)
--# MESSAGE(DCMTK_wrap_LIBRARY:${DCMTK_wrap_LIBRARY})
--# IF(NOT DCMTK_wrap_LIBRARY)
--# MESSAGE(FATAL_ERROR "error: Wrap library is required to use DCMTK. "
--# "On Ubuntu, you could install it using 'sudo apt-get libwrap0'")
--# ENDIF()
--# ENDIF()
--
-- SET(CMAKE_THREAD_LIBS_INIT)
-- IF(DCMTK_oflog_LIBRARY)
-- # Hack - Not having a DCMTKConfig.cmake file to read the settings from, we will attempt to
-- # find the library in all cases.
-- # Ideally, pthread library should be discovered only if DCMTK_WITH_THREADS is enabled.
-- SET(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-- FIND_PACKAGE(Threads)
-- ENDIF()
--
-- SET( DCMTK_FOUND "YES" )
-- SET( DCMTK_INCLUDE_DIR
-- ${DCMTK_DIR}/include
-- ${DCMTK_config_INCLUDE_DIR}
-+if(DCMTK_ofstd_INCLUDE_DIR)
-+ get_filename_component(DCMTK_dcmtk_INCLUDE_DIR
- ${DCMTK_ofstd_INCLUDE_DIR}
-- ${DCMTK_oflog_INCLUDE_DIR}
-- ${DCMTK_dcmdata_INCLUDE_DIR}
-- ${DCMTK_dcmjpeg_INCLUDE_DIR}
-- ${DCMTK_dcmnet_INCLUDE_DIR}
-- ${DCMTK_dcmimgle_INCLUDE_DIR}
-- ${DCMTK_dcmimage_INCLUDE_DIR}
-- )
--
-- SET( DCMTK_LIBRARIES
-- ${DCMTK_dcmimage_LIBRARY}
-- ${DCMTK_dcmimgle_LIBRARY}
-- ${DCMTK_dcmnet_LIBRARY}
-- ${DCMTK_dcmjpeg_LIBRARY}
-- ${DCMTK_dcmdata_LIBRARY}
-- ${DCMTK_ijg8_LIBRARY}
-- ${DCMTK_ijg12_LIBRARY}
-- ${DCMTK_ijg16_LIBRARY}
-- ${DCMTK_oflog_LIBRARY}
-- ${DCMTK_ofstd_LIBRARY}
-- ${DCMTK_config_LIBRARY}
-- ${CMAKE_THREAD_LIBS_INIT}
-- )
--
-- IF(DCMTK_imagedb_LIBRARY)
-- SET( DCMTK_LIBRARIES
-- ${DCMTK_LIBRARIES}
-- ${DCMTK_imagedb_LIBRARY}
-- )
-- ENDIF(DCMTK_imagedb_LIBRARY)
--
-- IF( WIN32 )
-- SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} ws2_32 netapi32 wsock32)
-- ENDIF( WIN32 )
--
--# IF (NOT WIN32)
--# SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} ${DCMTK_wrap_LIBRARY} )
--# ENDIF()
--
--ENDIF()
--
--FIND_PROGRAM(DCMTK_DCMDUMP_EXECUTABLE dcmdump
-- PATHS
-- ${DCMTK_DIR}/bin
-- NO_DEFAULT_PATH
-- )
--
--FIND_PROGRAM(DCMTK_DCMDJPEG_EXECUTABLE dcmdjpeg
-- PATHS
-- ${DCMTK_DIR}/bin
-- NO_DEFAULT_PATH
-- )
--
--FIND_PROGRAM(DCMTK_DCMDRLE_EXECUTABLE dcmdrle
-- PATHS
-- ${DCMTK_DIR}/bin
-- NO_DEFAULT_PATH
-- )
--
--FIND_PROGRAM(DCMTK_DCMQRSCP_EXECUTABLE dcmqrscp
-- PATHS
-- ${DCMTK_DIR}/bin
-- NO_DEFAULT_PATH
-- )
--
--FIND_PROGRAM(DCMTK_STORESCU_EXECUTABLE storescu
-- PATHS
-- ${DCMTK_DIR}/bin
-- NO_DEFAULT_PATH
-- )
--
--MARK_AS_ADVANCED(
-- DCMTK_DCMDUMP_EXECUTABLE
-- DCMTK_DCMDJPEG_EXECUTABLE
-- DCMTK_DCMDRLE_EXECUTABLE
-- DCMTK_DCMQRSCP_EXECUTABLE
-- DCMTK_STORESCU_EXECUTABLE
-+ PATH
-+ CACHE)
-+ list(APPEND DCMTK_INCLUDE_DIRS ${DCMTK_dcmtk_INCLUDE_DIR})
-+ mark_as_advanced(DCMTK_dcmtk_INCLUDE_DIR)
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(DCMTK DEFAULT_MSG
- DCMTK_config_INCLUDE_DIR
-+ DCMTK_ofstd_INCLUDE_DIR
-+ DCMTK_ofstd_LIBRARY
- DCMTK_dcmdata_INCLUDE_DIR
- DCMTK_dcmdata_LIBRARY
-- DCMTK_dcmnet_INCLUDE_DIR
-- DCMTK_dcmnet_LIBRARY
- DCMTK_dcmimgle_INCLUDE_DIR
-- DCMTK_dcmimgle_LIBRARY
-- DCMTK_dcmimage_INCLUDE_DIR
-- DCMTK_dcmimage_LIBRARY
-- DCMTK_imagedb_LIBRARY
-- DCMTK_ofstd_INCLUDE_DIR
-- DCMTK_ofstd_LIBRARY
-- DCMTK_oflog_INCLUDE_DIR
-- DCMTK_oflog_LIBRARY
-- )
-+ DCMTK_dcmimgle_LIBRARY)
-+
-+# Compatibility: This variable is deprecated
-+set(DCMTK_INCLUDE_DIR ${DCMTK_INCLUDE_DIRS})
+ #include <dcmtk/dcmjpeg/djdecode.h> /* for dcmjpeg decoders */
+ #include <dcmtk/dcmjpeg/djencode.h> /* for dcmjpeg encoders */
+Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDcmSCU.cc
+===================================================================
+--- ctk-0.1.0~git20120125.orig/Libs/DICOM/Core/ctkDcmSCU.cc 2012-01-26 10:05:09.000000000 +0100
++++ ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDcmSCU.cc 2012-01-26 10:05:47.000000000 +0100
+@@ -45,6 +45,7 @@
-+foreach(executable dcmdump dcmdjpeg dcmdrle)
-+ string(TOUPPER ${executable} EXECUTABLE)
-+ find_program(DCMTK_${EXECUTABLE}_EXECUTABLE ${executable} ${DCMTK_DIR}/bin)
-+ mark_as_advanced(DCMTK_${EXECUTABLE}_EXECUTABLE)
-+endforeach()
+ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
+
++#define HAVE_CONFIG_H
+ #include "ctkDcmSCU.h" // changed for CTK
+ #include "dcmtk/dcmnet/diutil.h" /* for dcmnet logger */
+ #include "dcmtk/dcmdata/dcuid.h" /* for dcmFindUIDName() */
Modified: trunk/packages/ctk/trunk/debian/patches/series
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/series 2012-01-25 13:45:27 UTC (rev 9434)
+++ trunk/packages/ctk/trunk/debian/patches/series 2012-01-26 09:07:33 UTC (rev 9435)
@@ -1,4 +1,3 @@
debian-changes-0.1.0-2
debian-changes-0.1.0-3
-fixvtk.patch
fixdcmtk.patch
More information about the debian-med-commit
mailing list