Author: domibel
Date: 2012-12-20 03:45:28 +0000 (Thu, 20 Dec 2012)
New Revision: 12706
Modified:
trunk/packages/ctk/trunk/debian/changelog
trunk/packages/ctk/trunk/debian/get-orig-source
trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch
trunk/packages/ctk/trunk/debian/rules
Log:
update to development version from 2012-12-19
Modified: trunk/packages/ctk/trunk/debian/changelog
===================================================================
--- trunk/packages/ctk/trunk/debian/changelog 2012-12-19 18:33:30 UTC (rev
12705)
+++ trunk/packages/ctk/trunk/debian/changelog 2012-12-20 03:45:28 UTC (rev
12706)
@@ -1,4 +1,4 @@
-ctk (0.1.0~git20120125-1) UNRELEASED; urgency=low
+ctk (0.1.0~git20121219-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/get-orig-source
===================================================================
--- trunk/packages/ctk/trunk/debian/get-orig-source 2012-12-19 18:33:30 UTC
(rev 12705)
+++ trunk/packages/ctk/trunk/debian/get-orig-source 2012-12-20 03:45:28 UTC
(rev 12706)
@@ -11,7 +11,7 @@
fi
REVISION=`echo $VERSION | sed -e 's/^.*git//g'`
-REVISION=c21e21ecdeba30ab00bc744a99b5d0bdabe54c8f
+REVISION=4276efebf29a802e94d8f096234f5df72732449a
if [ -z ${TARFILE}]; then
TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
Modified: trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch
===================================================================
--- trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch 2012-12-19
18:33:30 UTC (rev 12705)
+++ trunk/packages/ctk/trunk/debian/patches/fixdcmtk.patch 2012-12-20
03:45:28 UTC (rev 12706)
@@ -1,10 +1,10 @@
Taken from:
https://github.com/malaterre/CTK/commit/e06d661
This has not been pulled yet in upstream
-Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMDataset.cpp
+Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMDataset.cpp
===================================================================
---- 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
+--- 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"
@@ -18,55 +18,55 @@
#include <stdexcept>
-Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMIndexer.cpp
+Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMIndexer.cpp
===================================================================
---- 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"
+--- 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
++#define HAVE_CONFIG_H
#include <dcmtk/dcmdata/dcfilefo.h>
#include <dcmtk/dcmdata/dcfilefo.h>
#include <dcmtk/dcmdata/dcdeftag.h>
-Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMQuery.cpp
+Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMQuery.cpp
===================================================================
---- 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
+--- 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
++#define HAVE_CONFIG_H
+#include <dcmtk/dcmnet/dimse.h>
+#include <dcmtk/dcmnet/diutil.h>
+ #include "ctkDcmSCU.h"
#include <dcmtk/dcmdata/dcfilefo.h>
- #include <dcmtk/dcmdata/dcfilefo.h>
-Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMRetrieve.cpp
+Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMRetrieve.cpp
===================================================================
---- 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
+--- 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
++#define HAVE_CONFIG_H
+#include <dcmtk/dcmnet/dimse.h>
+#include <dcmtk/dcmnet/diutil.h>
+ #include "ctkDcmSCU.h"
#include <dcmtk/dcmdata/dcfilefo.h>
- #include <dcmtk/dcmdata/dcfilefo.h>
-Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/CMakeLists.txt
+Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/CMakeLists.txt
===================================================================
---- 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 @@
+--- 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)
@@ -76,10 +76,10 @@
ctkMacroBuildLib(
NAME ${PROJECT_NAME}
EXPORT_DIRECTIVE ${KIT_export_directive}
-Index: ctk-0.1.0~git20120125/Libs/DICOM/Core/ctkDICOMDataset.h
+Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMDataset.h
===================================================================
---- 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
+--- 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"
@@ -90,10 +90,10 @@
#include <QtCore>
-Index: ctk-0.1.0~git20120125/Libs/Widgets/Testing/Cpp/CMakeLists.txt
+Index: ctk-0.1.0~git20121219/Libs/Widgets/Testing/Cpp/CMakeLists.txt
===================================================================
---- 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
+--- 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
@@ -103,34 +103,11 @@
ctkColorPickerButtonTest1.cpp
ctkComboBoxTest1.cpp
ctkCompleterTest1.cpp
-Index: ctk-0.1.0~git20120125/Utilities/CMake/FindDCMTK.cmake
+Index: ctk-0.1.0~git20121219/Libs/DICOM/Core/ctkDICOMDatabase.cpp
===================================================================
---- 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
- #
-
--# DCMTK_INCLUDE_DIR - Directories to include to use DCMTK
-+# DCMTK_INCLUDE_DIRS - Directories to include to use DCMTK
- # DCMTK_LIBRARIES - Files to link against to use DCMTK
- # DCMTK_FOUND - If false, don't try to use DCMTK
- # DCMTK_DIR - (optional) Source directory for DCMTK
-@@ -13,7 +13,8 @@
-
- #=============================================================================
- # Copyright 2004-2009 Kitware, Inc.
--# Copyright 2009 Mathieu Malaterre <[email protected]>
-+# Copyright 2009-2010 Mathieu Malaterre <[email protected]>
-+# Copyright 2010 Thomas Sondergaard <[email protected]>
- #
- # Distributed under the OSI-approved BSD License (the "License");
- # see accompanying file Copyright.txt for details.
-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 @@
+--- 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 */
@@ -139,15 +116,3 @@
#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:06:22.000000000 +0100
-@@ -43,6 +43,7 @@
- // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
- //
-
-+#define HAVE_CONFIG_H
- #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is
included first */
-
- #include "ctkDcmSCU.h" // changed for CTK
Modified: trunk/packages/ctk/trunk/debian/rules
===================================================================
--- trunk/packages/ctk/trunk/debian/rules 2012-12-19 18:33:30 UTC (rev
12705)
+++ trunk/packages/ctk/trunk/debian/rules 2012-12-20 03:45:28 UTC (rev
12706)
@@ -1,20 +1,28 @@
#!/usr/bin/make -f
-#DH_VERBOSE=0
+DH_VERBOSE=1
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
CMAKE_FLAGS = \
- -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 \
- -DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
- -DCTK_SUPERBUILD:BOOL=OFF \
+ -DCMAKE_BUILD_TYPE:STRING=Debug \
+ -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 \
+ -DCTK_LIB_CommandLineModules/Backend/LocalProcess:BOOL=ON \
+ -DCTK_LIB_CommandLineModules/Frontend/QtGui:BOOL=ON \
+ -DCTK_LIB_PluginFramework:BOOL=ON \
+ -DCTK_LIB_DICOM/Widgets:BOOL=OFF \
+ -DCTK_PLUGIN_org.commontk.eventadmin:BOOL=ON \
+ -DCTK_PLUGIN_org.commontk.configadmin:BOOL=ON \
+ -DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
+ -DCTK_SUPERBUILD:BOOL=OFF \
pkg_run = libctk0.1
pkg_dev = libctk-dev
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
