[med-svn] r15118 - in trunk/packages/ctk/trunk/debian: . patches
Dominique Belhachemi
domibel at alioth.debian.org
Wed Nov 6 05:20:56 UTC 2013
Author: domibel
Date: 2013-11-06 05:20:56 +0000 (Wed, 06 Nov 2013)
New Revision: 15118
Added:
trunk/packages/ctk/trunk/debian/patches/fix_dcmtk.patch
trunk/packages/ctk/trunk/debian/patches/lib_path.patch
trunk/packages/ctk/trunk/debian/patches/log4cplus_namespace.patch
Removed:
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/debian-changes-0.1.0-4
trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch
trunk/packages/ctk/trunk/debian/patches/fixvtk.patch
Modified:
trunk/packages/ctk/trunk/debian/changelog
trunk/packages/ctk/trunk/debian/compat
trunk/packages/ctk/trunk/debian/control
trunk/packages/ctk/trunk/debian/get-orig-source
trunk/packages/ctk/trunk/debian/patches/series
trunk/packages/ctk/trunk/debian/rules
Log:
use a new upstream snapshot 0.1.0+git20131105~b8307961b6
Modified: trunk/packages/ctk/trunk/debian/changelog
===================================================================
--- trunk/packages/ctk/trunk/debian/changelog 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/changelog 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1,16 +1,18 @@
-ctk (0.1.0~git20121219-1) UNRELEASED; urgency=low
+ctk (0.1.0+git20131105~b8307961b6-1) experimental; urgency=low
- * Use newer git commit, to allow building with DCMTK 3.6.0
- - Build CTK/DICOM module
+ * new upstream release
+ * bump debian/compat to 9
+ * bumpStandards-Version: 3.9.4
+ * removed obsolete DM-Upload-Allowed field
+
+ [ Mathieu Malaterre ]
* Fix spelling in d/control. Closes: #635569
- * Add BFD module (requires binutils-dev)
- * Remove a test (takes too long)
[ Thorsten Alteholz ]
* debian/get-orig-source: put orig.tar.gz in ../tarballs to allow
automatic build with svn-buildpackage
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Sun, 04 Sep 2011 14:53:54 +0200
+ -- Dominique Belhachemi <domibel at debian.org> Tue, 05 Nov 2013 22:28:14 -0500
ctk (0.1.0-4) experimental; urgency=low
Modified: trunk/packages/ctk/trunk/debian/compat
===================================================================
--- trunk/packages/ctk/trunk/debian/compat 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/compat 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1 +1 @@
-8
+9
Modified: trunk/packages/ctk/trunk/debian/control
===================================================================
--- trunk/packages/ctk/trunk/debian/control 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/control 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1,12 +1,11 @@
Source: ctk
Priority: optional
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), 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
+Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>, Dominique Belhachemi <domibel at debian.org>
+Build-Depends: debhelper (>= 9), cmake (>= 2.8.4), libqt4-dev, libqt4-opengl-dev,
+ libqtwebkit-dev, libdcmtk2-dev, libtiff-dev, libvtk5-dev, libvtk5-qt4-dev,
+ libinsighttoolkit4-dev
+Standards-Version: 3.9.4
Section: libs
Homepage: http://www.commontk.org/
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/ctk/trunk/
Modified: trunk/packages/ctk/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/ctk/trunk/debian/get-orig-source 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/get-orig-source 2013-11-06 05:20:56 UTC (rev 15118)
@@ -11,7 +11,7 @@
fi
REVISION=`echo $VERSION | sed -e 's/^.*git//g'`
-REVISION=4276efebf29a802e94d8f096234f5df72732449a
+REVISION=b8307961b6420ccceb3c943e5958371f1d2ddcf6
if [ -z ${TARFILE}]; then
TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
@@ -29,9 +29,6 @@
git checkout ${REVISION}
cd ..
rm -rf ${FOLDER}/.git
-git clone https://github.com/commontk/Log4Qt.git ${FOLDER}/Utilities/Log4Qt
-#git checkout 8d3558b
-rm -rf ${FOLDER}/Utilities/Log4Qt/.git
GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER}
rm -rf ${FOLDER}
Deleted: trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-2
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-2 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-2 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1,39 +0,0 @@
-Description: Upstream changes introduced in version 0.1.0-2
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ctk (0.1.0-2) experimental; urgency=low
- .
- * Initial release (Closes: #601180)
- .
- The person named in the Author field signed this changelog entry.
-Author: Dominique Belhachemi <domibel at debian.org>
-Bug-Debian: http://bugs.debian.org/601180
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-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)
-+
- #-----------------------------------------------------------------------------
- # Library mode: SHARED (default) or STATIC
- #
Deleted: trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-3
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-3 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-3 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 0.1.0-3
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ctk (0.1.0-3) experimental; urgency=low
- .
- * compile log4qt with -fPIC on all archs (Closes: #634780)
- * build with -DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON
- * build with -DCTK_LIB_Widgets:BOOL=ON
- .
- The person named in the Author field signed this changelog entry.
-Author: Dominique Belhachemi <domibel at debian.org>
-Bug-Debian: http://bugs.debian.org/634780
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: ctk-0.1.0~git20120125/Libs/ImageProcessing/ITK/Core/CMakeLists.txt
-===================================================================
---- 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}
-- TARGET_LIBRARIES ${KIT_target_libraries}
-+ TARGET_LIBRARIES ${KIT_target_libraries} ITKCommon
- RESOURCES ${KIT_resources}
- LIBRARY_TYPE ${CTK_LIBRARY_MODE}
- )
-Index: ctk-0.1.0~git20120125/Utilities/Log4Qt/CMakeLists.txt
-===================================================================
---- 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
- #
--set(BUILD_SHARED_LIBS FALSE)
-+set(BUILD_SHARED_LIBS FALSE)#
-
- #-----------------------------------------------------------------------------
- # Set symbol visibility Flags
-@@ -118,9 +118,9 @@
- # used when making a shared object; recompile with -fPIC
- # See http://www.cmake.org/pipermail/cmake/2007-May/014350.html
- #
--IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
-+#IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIC")
--ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
-+#ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
-
- #-----------------------------------------------------------------------------
- # Install rules
Deleted: trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-4
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-4 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/patches/debian-changes-0.1.0-4 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1,115 +0,0 @@
-Description: Upstream changes introduced in version 0.1.0-4
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ctk (0.1.0-4) experimental; urgency=low
- .
- * Changed maintainer and uploader
- * build with -DCTK_APP_ctkCLIPluginExplorer:BOOL=ON
- .
- The person named in the Author field signed this changelog entry.
-Author: Dominique Belhachemi <domibel at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- ctk-0.1.0.orig/Libs/Visualization/VTK/Core/target_libraries.cmake
-+++ ctk-0.1.0/Libs/Visualization/VTK/Core/target_libraries.cmake
-@@ -5,6 +5,5 @@
- #
-
- SET(target_libraries
-- VTK_LIBRARIES
- CTKCore
-- )
-\ No newline at end of file
-+ )
---- ctk-0.1.0.orig/Libs/Visualization/VTK/Core/CMakeLists.txt
-+++ ctk-0.1.0/Libs/Visualization/VTK/Core/CMakeLists.txt
-@@ -3,6 +3,7 @@ PROJECT(CTKVisualizationVTKCore)
- #
- # 3rd party dependencies
- #
-+FIND_PACKAGE(VTK REQUIRED)
- INCLUDE(${VTK_USE_FILE})
-
- #
-@@ -79,7 +80,7 @@ ctkMacroBuildLib(
- SRCS ${KIT_SRCS}
- MOC_SRCS ${KIT_MOC_SRCS}
- UI_FORMS ${KIT_UI_FORMS}
-- TARGET_LIBRARIES ${KIT_target_libraries}
-+ TARGET_LIBRARIES ${KIT_target_libraries} vtkCommon vtkFiltering vtkHybrid
- RESOURCES ${KIT_resources}
- LIBRARY_TYPE ${CTK_LIBRARY_MODE}
- )
---- ctk-0.1.0.orig/Libs/Scripting/Python/Core/CMakeLists.txt
-+++ ctk-0.1.0/Libs/Scripting/Python/Core/CMakeLists.txt
-@@ -50,6 +50,8 @@ CONFIGURE_FILE(
- # The following macro will read the target libraries from the file 'target_libraries.cmake'
- ctkFunctionGetTargetLibraries(KIT_target_libraries)
-
-+INCLUDE_DIRECTORIES(/usr/include/PythonQt/)
-+
- # Link against vtkPython if required
- IF(CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_VTK)
- LIST(APPEND KIT_target_libraries vtkPythonCore)
---- ctk-0.1.0.orig/Libs/DICOM/Core/ctkDICOMIndexer.cpp
-+++ ctk-0.1.0/Libs/DICOM/Core/ctkDICOMIndexer.cpp
-@@ -31,6 +31,14 @@
- #include <QDebug>
- #include <QPixmap>
-
-+#define DCM_PatientsName DcmTagKey(0x0010, 0x0010)
-+#define DCM_PatientsBirthDate DcmTagKey(0x0010, 0x0030)
-+#define DCM_PatientsBirthTime DcmTagKey(0x0010, 0x0032)
-+#define DCM_PatientsSex DcmTagKey(0x0010, 0x0040)
-+#define DCM_PatientsAge DcmTagKey(0x0010, 0x1010)
-+#define DCM_PerformingPhysiciansName DcmTagKey(0x0008, 0x1050)
-+#define DCM_ReferringPhysiciansName DcmTagKey(0x0008, 0x0090)
-+
-
- // ctkDICOM includes
- #include "ctkDICOMIndexer.h"
---- ctk-0.1.0.orig/Libs/DICOM/Core/CMakeLists.txt
-+++ ctk-0.1.0/Libs/DICOM/Core/CMakeLists.txt
-@@ -84,6 +84,9 @@ set (DCMQRSCP_STORE_DIR ${CMAKE_CURRENT_
- CONFIGURE_FILE( Resources/dcmqrscp.cfg.in dcmqrscp.cfg )
- set (DCMQRSCP_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/dcmqrscp.cfg)
-
-+INCLUDE_DIRECTORIES( /usr/include/dcmtk/dcmimgle/ )
-+INCLUDE_DIRECTORIES( /usr/include/dcmtk/dcmdata/ )
-+
- ctkMacroBuildLib(
- NAME ${PROJECT_NAME}
- EXPORT_DIRECTIVE ${KIT_export_directive}
---- ctk-0.1.0.orig/Libs/DICOM/Core/ctkDICOMDatabase.cpp
-+++ ctk-0.1.0/Libs/DICOM/Core/ctkDICOMDatabase.cpp
-@@ -20,6 +20,16 @@
-
- #include <stdexcept>
-
-+
-+#define DCM_PatientsName DcmTagKey(0x0010, 0x0010)
-+#define DCM_PatientsBirthDate DcmTagKey(0x0010, 0x0030)
-+#define DCM_PatientsBirthTime DcmTagKey(0x0010, 0x0032)
-+#define DCM_PatientsSex DcmTagKey(0x0010, 0x0040)
-+#define DCM_PatientsAge DcmTagKey(0x0010, 0x1010)
-+#define DCM_PerformingPhysiciansName DcmTagKey(0x0008, 0x1050)
-+#define DCM_ReferringPhysiciansName DcmTagKey(0x0008, 0x0090)
-+
-+
- // Qt includes
- #include <QSqlQuery>
- #include <QSqlRecord>
Added: trunk/packages/ctk/trunk/debian/patches/fix_dcmtk.patch
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/fix_dcmtk.patch (rev 0)
+++ trunk/packages/ctk/trunk/debian/patches/fix_dcmtk.patch 2013-11-06 05:20:56 UTC (rev 15118)
@@ -0,0 +1,11 @@
+--- ctk-0.1.0+git20131105~b8307961b6.orig/CMakeLists.txt
++++ ctk-0.1.0+git20131105~b8307961b6/CMakeLists.txt
+@@ -321,6 +321,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+
+ set(CTK_C_FLAGS "${cflags} ${CTK_C_FLAGS}")
++ # Fix for debian bug #637687, should never be merged in CTK master
++ set(CTK_CXX_FLAGS "${CTK_CXX_FLAGS} -DHAVE_CONFIG_H")
+ set(CTK_CXX_FLAGS "${cflags} -Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel -Wsign-promo ${CTK_CXX_FLAGS}")
+ endif()
+
Deleted: trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1,118 +0,0 @@
-Taken from:
-https://github.com/malaterre/CTK/commit/e06d661
-This has not been pulled yet in upstream
-Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMDataset.cpp
-===================================================================
---- ctk-0.1.0~git20121219.orig/Libs/DICOM/Core/ctkDICOMDataset.cpp 2012-12-19 19:49:58.000000000 -0500
-+++ ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMDataset.cpp 2012-12-19 21:58:28.000000000 -0500
-@@ -21,9 +21,9 @@
-
- #include "ctkDICOMDataset.h"
-
--#include <dctk.h>
--#include <dcostrmb.h>
--#include <dcistrmb.h>
-+#include <dcmtk/dcmdata/dctk.h>
-+#include <dcmtk/dcmdata/dcostrmb.h>
-+#include <dcmtk/dcmdata/dcistrmb.h>
-
- #include <stdexcept>
-
-Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMIndexer.cpp
-===================================================================
---- ctk-0.1.0~git20121219.orig/Libs/DICOM/Core/ctkDICOMIndexer.cpp 2012-12-19 19:49:58.000000000 -0500
-+++ ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMIndexer.cpp 2012-12-19 22:18:01.067893963 -0500
-@@ -40,6 +40,7 @@
- #include "ctkDICOMDatabase.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~git20121219/Libs/DICOM/Core/ctkDICOMQuery.cpp
-===================================================================
---- ctk-0.1.0~git20121219.orig/Libs/DICOM/Core/ctkDICOMQuery.cpp 2012-12-19 19:49:58.000000000 -0500
-+++ ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMQuery.cpp 2012-12-19 22:20:55.147919817 -0500
-@@ -35,8 +35,9 @@
- #include "ctkLogger.h"
-
- // DCMTK includes
--#include "dcmtk/dcmnet/dimse.h"
--#include "dcmtk/dcmnet/diutil.h"
-+#define HAVE_CONFIG_H
-+#include <dcmtk/dcmnet/dimse.h>
-+#include <dcmtk/dcmnet/diutil.h>
- #include "ctkDcmSCU.h"
-
- #include <dcmtk/dcmdata/dcfilefo.h>
-Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMRetrieve.cpp
-===================================================================
---- ctk-0.1.0~git20121219.orig/Libs/DICOM/Core/ctkDICOMRetrieve.cpp 2012-12-19 22:12:18.053645269 -0500
-+++ ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMRetrieve.cpp 2012-12-19 22:13:12.490476245 -0500
-@@ -27,8 +27,9 @@
- #include "ctkLogger.h"
-
- // DCMTK includes
--#include "dcmtk/dcmnet/dimse.h"
--#include "dcmtk/dcmnet/diutil.h"
-+#define HAVE_CONFIG_H
-+#include <dcmtk/dcmnet/dimse.h>
-+#include <dcmtk/dcmnet/diutil.h>
- #include "ctkDcmSCU.h"
-
- #include <dcmtk/dcmdata/dcfilefo.h>
-Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/CMakeLists.txt
-===================================================================
---- ctk-0.1.0~git20121219.orig/Libs/DICOM/Core/CMakeLists.txt 2012-12-19 19:49:58.000000000 -0500
-+++ ctk-0.1.0~git20121219/Libs/DICOM/Core/CMakeLists.txt 2012-12-19 21:58:28.000000000 -0500
-@@ -91,6 +91,9 @@
- configure_file( Resources/dcmqrscp.cfg.in dcmqrscp.cfg )
- set (DCMQRSCP_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/dcmqrscp.cfg)
-
-+find_package(DCMTK REQUIRED)
-+list(APPEND KIT_target_libraries ${DCMTK_LIBRARIES})
-+
- ctkMacroBuildLib(
- NAME ${PROJECT_NAME}
- EXPORT_DIRECTIVE ${KIT_export_directive}
-Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMDataset.h
-===================================================================
---- ctk-0.1.0~git20121219.orig/Libs/DICOM/Core/ctkDICOMDataset.h 2012-12-19 19:49:58.000000000 -0500
-+++ ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMDataset.h 2012-12-19 21:58:28.000000000 -0500
-@@ -25,7 +25,8 @@
-
- #include "ctkDICOMPersonName.h"
-
--#include <dcdatset.h> // DCMTK DcmDataset
-+#define HAVE_CONFIG_H
-+#include <dcmtk/dcmdata/dcdatset.h> // DCMTK DcmDataset
-
- #include <QtCore>
-
-Index: ctk-0.1.0~git20121219/Libs/Widgets/Testing/Cpp/CMakeLists.txt
-===================================================================
---- ctk-0.1.0~git20121219.orig/Libs/Widgets/Testing/Cpp/CMakeLists.txt 2012-12-19 19:49:58.000000000 -0500
-+++ ctk-0.1.0~git20121219/Libs/Widgets/Testing/Cpp/CMakeLists.txt 2012-12-19 21:58:28.000000000 -0500
-@@ -16,7 +16,7 @@
- ctkCollapsibleButtonTest2.cpp
- ctkCollapsibleGroupBoxTest1.cpp
- ctkColorDialogTest1.cpp
-- ctkColorDialogTest2.cpp
-+ #ctkColorDialogTest2.cpp
- ctkColorPickerButtonTest1.cpp
- ctkComboBoxTest1.cpp
- ctkCompleterTest1.cpp
-Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMDatabase.cpp
-===================================================================
---- ctk-0.1.0~git20121219.orig/Libs/DICOM/Core/ctkDICOMDatabase.cpp 2012-12-19 19:49:58.000000000 -0500
-+++ ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMDatabase.cpp 2012-12-19 21:58:28.000000000 -0500
-@@ -51,7 +51,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 */
Deleted: trunk/packages/ctk/trunk/debian/patches/fixvtk.patch
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/fixvtk.patch 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/patches/fixvtk.patch 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1,12 +0,0 @@
-Index: ctk-0.1.0~git622a40d/Libs/Visualization/VTK/Core/CMakeLists.txt
-===================================================================
---- ctk-0.1.0~git622a40d.orig/Libs/Visualization/VTK/Core/CMakeLists.txt 2011-09-03 19:08:49.000000000 +0200
-+++ ctk-0.1.0~git622a40d/Libs/Visualization/VTK/Core/CMakeLists.txt 2011-09-03 19:09:00.000000000 +0200
-@@ -3,6 +3,7 @@
- #
- # 3rd party dependencies
- #
-+find_package(VTK REQUIRED)
- INCLUDE(${VTK_USE_FILE})
-
- #
Added: trunk/packages/ctk/trunk/debian/patches/lib_path.patch
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/lib_path.patch (rev 0)
+++ trunk/packages/ctk/trunk/debian/patches/lib_path.patch 2013-11-06 05:20:56 UTC (rev 15118)
@@ -0,0 +1,11 @@
+--- ctk-0.1.0~git20131105.orig/CMakeLists.txt
++++ ctk-0.1.0~git20131105/CMakeLists.txt
+@@ -140,7 +140,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}")
Added: trunk/packages/ctk/trunk/debian/patches/log4cplus_namespace.patch
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/log4cplus_namespace.patch (rev 0)
+++ trunk/packages/ctk/trunk/debian/patches/log4cplus_namespace.patch 2013-11-06 05:20:56 UTC (rev 15118)
@@ -0,0 +1,20 @@
+--- ctk-0.1.0~git20131105.orig/Libs/DICOM/Core/ctkDICOMUtil.cpp
++++ ctk-0.1.0~git20131105/Libs/DICOM/Core/ctkDICOMUtil.cpp
+@@ -30,7 +30,7 @@
+ //------------------------------------------------------------------------------
+ void ctk::setDICOMLogLevel(ctkErrorLogLevel::LogLevel level)
+ {
+- dcmtk::log4cplus::Logger log = dcmtk::log4cplus::Logger::getRoot();
++ log4cplus::Logger log = log4cplus::Logger::getRoot();
+ switch (level)
+ {
+ case ctkErrorLogLevel::Trace: log.setLogLevel(OFLogger::TRACE_LOG_LEVEL); break;
+@@ -49,7 +49,7 @@ void ctk::setDICOMLogLevel(ctkErrorLogLe
+ //------------------------------------------------------------------------------
+ ctkErrorLogLevel::LogLevel ctk::dicomLogLevel()
+ {
+- dcmtk::log4cplus::Logger log = dcmtk::log4cplus::Logger::getRoot();
++ log4cplus::Logger log = log4cplus::Logger::getRoot();
+ switch (log.getLogLevel())
+ {
+ case OFLogger::TRACE_LOG_LEVEL: return ctkErrorLogLevel::Trace;
Modified: trunk/packages/ctk/trunk/debian/patches/series
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/series 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/patches/series 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1,3 +1,3 @@
-debian-changes-0.1.0-2
-debian-changes-0.1.0-3
-fixdcmtk.patch
+log4cplus_namespace.patch
+lib_path.patch
+fix_dcmtk.patch
Modified: trunk/packages/ctk/trunk/debian/rules
===================================================================
--- trunk/packages/ctk/trunk/debian/rules 2013-11-05 20:04:19 UTC (rev 15117)
+++ trunk/packages/ctk/trunk/debian/rules 2013-11-06 05:20:56 UTC (rev 15118)
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-DH_VERBOSE=1
+DH_VERBOSE=0
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
@@ -9,19 +9,38 @@
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_SKIP_RPATH:BOOL=ON \
- -DBUILD_TESTING:BOOL=ON \
- -DCTK_APP_ctkCLIPluginExplorer:BOOL=ON \
- -DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON \
- -DCTK_LIB_DICOM/Core:BOOL=ON \
- -DCTK_LIB_Widgets:BOOL=ON \
- -DCTK_LIB_Scripting/Python/Core:BOOL=OFF \
+ -DBUILD_TESTING:BOOL=OFF \
+ -DCTK_ENABLE_DICOM:BOOL=ON \
+ -DDCMTK_DIR:PATH=/usr \
+ -DCTK_APP_ctkCommandLineModuleExplorer:BOOL=ON \
+ -DCTK_APP_ctkDICOM:BOOL=ON \
+ -DCTK_APP_ctkPluginBrowser:BOOL=ON \
+ -DCTK_APP_ctkPluginGenerator:BOOL=ON \
+ -DCTK_BUILD_QTDESIGNER_PLUGINS:BOOL=ON \
+ -DCTK_ENABLE_DICOM:BOOL=ON \
+ -DCTK_ENABLE_PluginFramework:BOOL=ON \
+ -DCTK_ENABLE_Python_Wrapping:BOOL=OFF \
+ -DCTK_ENABLE_Widgets:BOOL=ON \
+ -DCTK_LIB_CommandLineModules/Backend/FunctionPointer:BOOL=ON \
-DCTK_LIB_CommandLineModules/Backend/LocalProcess:BOOL=ON \
+ -DCTK_LIB_CommandLineModules/Core:BOOL=ON \
-DCTK_LIB_CommandLineModules/Frontend/QtGui:BOOL=ON \
+ -DCTK_LIB_CommandLineModules/Frontend/QtWebKit:BOOL=ON \
+ -DCTK_LIB_Core:BOOL=ON \
+ -DCTK_LIB_DICOM/Core:BOOL=ON \
+ -DCTK_LIB_DICOM/Widgets:BOOL=ON \
+ -DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON \
-DCTK_LIB_PluginFramework:BOOL=ON \
- -DCTK_LIB_DICOM/Widgets:BOOL=OFF \
+ -DCTK_LIB_Scripting/Python/Core:BOOL=OFF \
+ -DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
+ -DCTK_LIB_Visualization/VTK/Widgets:BOOL=ON \
+ -DCTK_LIB_Widgets:BOOL=ON \
+ -DCTK_PLUGIN_org.commontk.configadmin:BOOL=ON \
-DCTK_PLUGIN_org.commontk.eventadmin:BOOL=ON \
- -DCTK_PLUGIN_org.commontk.configadmin:BOOL=ON \
- -DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
+ -DCTK_PLUGIN_org.commontk.log:BOOL=ON \
+ -DCTK_PLUGIN_org.commontk.metatype:BOOL=ON \
+ -DCTK_PLUGIN_org.commontk.plugingenerator.core:BOOL=ON \
+ -DCTK_PLUGIN_org.commontk.plugingenerator.ui:BOOL=ON \
-DCTK_SUPERBUILD:BOOL=OFF \
pkg_run = libctk0.1
@@ -44,7 +63,6 @@
override_dh_install:
# Runtime Package
dh_install -p$(pkg_run) usr/lib/*.so.*
- dh_install -p$(pkg_run) usr/lib/*.a
# Development Package
dh_install -p$(pkg_dev) usr/include
dh_install -p$(pkg_dev) usr/lib/lib*.so
More information about the debian-med-commit
mailing list