[med-svn] r7648 - in trunk/packages/ctk/debian: . patches

Mathieu Malaterre malat-guest at alioth.debian.org
Sat Sep 3 17:01:15 UTC 2011 

Author: malat-guest
Date: 2011-09-03 17:01:15 +0000 (Sat, 03 Sep 2011)
New Revision: 7648

Modified:
   trunk/packages/ctk/debian/changelog
   trunk/packages/ctk/debian/control
   trunk/packages/ctk/debian/patches/debian-changes-0.1.0-2
   trunk/packages/ctk/debian/patches/debian-changes-0.1.0-3
   trunk/packages/ctk/debian/rules
Log:
update for dicom

Modified: trunk/packages/ctk/debian/changelog
===================================================================
--- trunk/packages/ctk/debian/changelog	2011-09-03 16:51:43 UTC (rev 7647)
+++ trunk/packages/ctk/debian/changelog	2011-09-03 17:01:15 UTC (rev 7648)
@@ -2,6 +2,8 @@
 
   * Use newer git commit, to allow building with DCMTK 3.6.0
   * Fix spelling in d/control. Closes: #635569
+  * Add BFD module (requires binutils-dev)
+  * Build CTK/DICOM module
 
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Sat, 03 Sep 2011 18:31:29 +0200
 

Modified: trunk/packages/ctk/debian/control
===================================================================
--- trunk/packages/ctk/debian/control	2011-09-03 16:51:43 UTC (rev 7647)
+++ trunk/packages/ctk/debian/control	2011-09-03 17:01:15 UTC (rev 7648)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8), cmake (>= 2.8.2), cdbs, libqt4-dev,
  libdcmtk2-dev, libinsighttoolkit3-dev, libgdcm2-dev, zlib1g-dev, libvtk5-dev,
- libpythonqt2-dev, python-dev
+ libpythonqt2-dev, python-dev, binutils-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://www.commontk.org/

Modified: trunk/packages/ctk/debian/patches/debian-changes-0.1.0-2
===================================================================
--- trunk/packages/ctk/debian/patches/debian-changes-0.1.0-2	2011-09-03 16:51:43 UTC (rev 7647)
+++ trunk/packages/ctk/debian/patches/debian-changes-0.1.0-2	2011-09-03 17:01:15 UTC (rev 7648)
@@ -53,7 +53,7 @@
 -INCLUDE(${Log4Qt_USE_FILE})
 +INCLUDE_DIRECTORIES(${Log4Qt_SOURCE_DIR}/src)
 +#LINK_DIRECTORIES(${Log4Qt_BINARY_DIR}/bin)
-+SET(Log4Qt_LIBRARIES ${CTK_BINARY_DIR}/bin/libLog4Qt.a)
++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/debian/patches/debian-changes-0.1.0-3
===================================================================
--- trunk/packages/ctk/debian/patches/debian-changes-0.1.0-3	2011-09-03 16:51:43 UTC (rev 7647)
+++ trunk/packages/ctk/debian/patches/debian-changes-0.1.0-3	2011-09-03 17:01:15 UTC (rev 7648)
@@ -26,8 +26,10 @@
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- ctk-0.1.0.orig/Libs/ImageProcessing/ITK/Core/target_libraries.cmake
-+++ ctk-0.1.0/Libs/ImageProcessing/ITK/Core/target_libraries.cmake
+Index: ctk-0.1.0~git622a40d/Libs/ImageProcessing/ITK/Core/target_libraries.cmake
+===================================================================
+--- 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 @@
  #
  
@@ -36,9 +38,11 @@
 +#  ITK_LIBRARIES
    CTKCore
    )
---- ctk-0.1.0.orig/Libs/ImageProcessing/ITK/Core/CMakeLists.txt
-+++ ctk-0.1.0/Libs/ImageProcessing/ITK/Core/CMakeLists.txt
-@@ -3,6 +3,7 @@ PROJECT(CTKImageProcessingITKCore)
+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
  #
@@ -46,7 +50,7 @@
  INCLUDE(${ITK_USE_FILE})
  
  #
-@@ -40,7 +41,7 @@ ctkMacroBuildLib(
+@@ -40,7 +41,7 @@
    SRCS ${KIT_SRCS}
    MOC_SRCS ${KIT_MOC_SRCS}
    UI_FORMS ${KIT_UI_FORMS}
@@ -55,20 +59,11 @@
    RESOURCES ${KIT_resources}
    LIBRARY_TYPE ${CTK_LIBRARY_MODE}
    )
---- ctk-0.1.0.orig/Libs/Core/CMakeLists.txt
-+++ ctk-0.1.0/Libs/Core/CMakeLists.txt
-@@ -5,7 +5,7 @@ PROJECT(CTKCore)
- #
- INCLUDE_DIRECTORIES(${Log4Qt_SOURCE_DIR}/src)
- LINK_DIRECTORIES(${Log4Qt_BINARY_DIR}/bin)
--SET(Log4Qt_LIBRARIES ${Log4Qt_BINARY_DIR}/bin/libLog4Qt.a)
-+SET(Log4Qt_LIBRARIES ${Log4Qt_BINARY_DIR}/bin/libLog4Qt.a)#
- 
- # CMake modules
- SET(CMAKE_MODULE_PATH ${CTKCore_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH})
---- ctk-0.1.0.orig/Utilities/Log4Qt/CMakeLists.txt
-+++ ctk-0.1.0/Utilities/Log4Qt/CMakeLists.txt
-@@ -18,7 +18,7 @@ ENDFOREACH()
+Index: ctk-0.1.0~git622a40d/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
+@@ -18,7 +18,7 @@
  #-----------------------------------------------------------------------------
  # Library type - Statically built
  #
@@ -77,7 +72,7 @@
  
  #-----------------------------------------------------------------------------
  # Set symbol visibility Flags
-@@ -118,9 +118,9 @@ add_library(${PROJECT_NAME}
+@@ -118,9 +118,9 @@
  # used when making a shared object; recompile with -fPIC
  # See http://www.cmake.org/pipermail/cmake/2007-May/014350.html
  #

Modified: trunk/packages/ctk/debian/rules
===================================================================
--- trunk/packages/ctk/debian/rules	2011-09-03 16:51:43 UTC (rev 7647)
+++ trunk/packages/ctk/debian/rules	2011-09-03 17:01:15 UTC (rev 7648)
@@ -13,6 +13,7 @@
         -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_DICOM/Core:BOOL=OFF \

More information about the debian-med-commit mailing list