r36128 - in /packages/slicer/trunk/debian: changelog control patches/50_all_changes.diff

domibel-guest at users.alioth.debian.org domibel-guest at users.alioth.debian.org
Tue Feb 2 03:37:58 UTC 2010 

Author: domibel-guest
Date: Tue Feb  2 03:37:56 2010
New Revision: 36128

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36128
Log:
added patch for compiling with vtk 5.4

Modified:
    packages/slicer/trunk/debian/changelog
    packages/slicer/trunk/debian/control
    packages/slicer/trunk/debian/patches/50_all_changes.diff

Modified: packages/slicer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/changelog?rev=36128&op=diff
==============================================================================
--- packages/slicer/trunk/debian/changelog (original)
+++ packages/slicer/trunk/debian/changelog Tue Feb  2 03:37:56 2010
@@ -1,3 +1,11 @@
+slicer (3.4.0~svn10438-5) unstable; urgency=low
+
+  * added patch for compiling with vtk 5.4 (Closes: #567692)
+  * BIFF_STRLEN definition for vtkTeem added
+  * Bump standard version to 3.8.4
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Mon, 01 Feb 2010 21:46:02 -0500
+
 slicer (3.4.0~svn10438-4) unstable; urgency=low
 
   * Add build deps: libmysqlclient-dev, libgl2ps-dev, libavcodec-dev, libpq-dev,

Modified: packages/slicer/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/control?rev=36128&op=diff
==============================================================================
--- packages/slicer/trunk/debian/control (original)
+++ packages/slicer/trunk/debian/control Tue Feb  2 03:37:56 2010
@@ -3,14 +3,13 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
-Build-Depends: debhelper (>= 7), quilt, cmake, tcl8.5-dev, tk8.5-dev, libpng-dev, libjpeg-dev,
- libtiff-dev, libexpat1-dev, libinsighttoolkit3-dev (>= 3.16), libkwwidgets1-dev, 
- libfreetype6-dev, libxext-dev, libvtk5-dev (>= 5.2.1-11), libteem1-dev, libopenigtlink1-dev,
- uuid-dev, libbz2-dev, libxft-dev, libtclap-dev, libgdcm2-dev, libfftw3-dev, libopenjpeg-dev,
- libcurl4-openssl-dev, libmysqlclient-dev, libgl2ps-dev, libavcodec-dev,
- libavformat-dev, libswscale-dev, default-jdk, mpi-default-dev, libpq-dev
+Build-Depends: debhelper (>= 7), quilt, cmake, tcl8.5-dev, tk8.5-dev, libexpat1-dev,
+ libinsighttoolkit3-dev (>= 3.16), libkwwidgets1-dev,
+ libvtk5-dev (>= 5.2.1-11), libteem1-dev, libopenigtlink1-dev,
+ libbz2-dev, libxft-dev, libtclap-dev, libgdcm2-dev, libfftw3-dev,
+ libcurl4-openssl-dev, libopenjpeg-dev, uuid-dev
 Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/slicer/trunk/
 Section: graphics

Modified: packages/slicer/trunk/debian/patches/50_all_changes.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/50_all_changes.diff?rev=36128&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.diff (original)
+++ packages/slicer/trunk/debian/patches/50_all_changes.diff Tue Feb  2 03:37:56 2010
@@ -6,8 +6,8 @@
 
 Index: slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/CLI/CMakeLists.txt	2010-01-06 19:01:22.000000000 -0500
-+++ slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt	2010-01-06 21:18:24.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Applications/CLI/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -269,34 +269,6 @@
  target_link_libraries (${CLP}Lib ITKIO ITKBasicFilters)
  
@@ -79,8 +79,8 @@
      ZeroCrossingBasedEdgeDetectionImageFilterLib
 Index: slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt	2010-01-06 19:01:22.000000000 -0500
-+++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt	2010-01-06 21:18:24.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -18,8 +18,8 @@
  
  #
@@ -112,8 +112,8 @@
  # Move exec and module to where Slicer can find them
 Index: slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx	2010-01-06 19:01:22.000000000 -0500
-+++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx	2010-01-06 21:18:24.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx	2010-01-27 14:18:32.000000000 -0500
 @@ -3,7 +3,7 @@
  #endif
  
@@ -125,8 +125,8 @@
  #include <math.h>
 Index: slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/GUI/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt	2010-01-06 21:18:24.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Applications/GUI/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -45,7 +45,7 @@
      set(Slicer3_FORWARD_PATH_BUILD 
        "\"${Slicer3_FORWARD_DIR_BUILD}\",\"${VTK_DIR}/bin\",\"${KWWidgets_RUNTIME_DIRS}\",\"${ITK_DIR}/bin\",\"${Teem_DIR}/bin\",\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\",\"${OPENGL_gl_LIBRARY_PATH}\"")
@@ -151,8 +151,8 @@
  # Include dirs
 Index: slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/GUI/Slicer3.cxx	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx	2010-01-06 21:18:24.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Applications/GUI/Slicer3.cxx	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx	2010-01-27 14:18:32.000000000 -0500
 @@ -411,7 +411,7 @@
      }
  
@@ -164,8 +164,8 @@
    // ITK factories dir
 Index: slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Base/CLI/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt	2010-01-06 21:18:24.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Base/CLI/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -58,6 +58,11 @@
  slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
  slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} SlicerBaseCLI)
@@ -180,8 +180,8 @@
    LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
 Index: slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Base/GUI/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt	2010-01-06 21:18:24.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Base/GUI/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -177,6 +177,11 @@
    RemoteIO
    )
@@ -196,8 +196,8 @@
  
 Index: slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Base/Logic/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt	2010-01-06 21:18:24.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Base/Logic/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -115,6 +115,11 @@
  slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
  slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
@@ -212,8 +212,8 @@
    LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
 Index: slicer-3.4.0~svn10438/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/CMakeLists.txt	2010-01-06 19:01:22.000000000 -0500
-+++ slicer-3.4.0~svn10438/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -27,6 +27,11 @@
  
  set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
@@ -275,8 +275,8 @@
    )
 Index: slicer-3.4.0~svn10438/Libs/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -1,7 +1,6 @@
  project(SlicerLibs)
  
@@ -287,8 +287,8 @@
    LoadableModule
 Index: slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/FreeSurfer/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/FreeSurfer/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -68,9 +68,14 @@
    vtkIOTCL
    )
@@ -307,8 +307,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/GenerateCLP/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/GenerateCLP/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -11,10 +11,10 @@
    include(${ModuleDescriptionParser_USE_FILE})
  endif(ModuleDescriptionParser_FOUND)
@@ -326,8 +326,8 @@
  if(ITK_FOUND)
 Index: slicer-3.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/GenerateCLP/UseGenerateCLP.cmake.in	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/GenerateCLP/UseGenerateCLP.cmake.in	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in	2010-01-27 14:18:32.000000000 -0500
 @@ -5,10 +5,10 @@
    message(FATAL_ERROR "Cannot build without ITK. Please set ITK_DIR.")
  endif(ITK_FOUND)
@@ -345,8 +345,8 @@
  if(ModuleDescriptionParser_FOUND)
 Index: slicer-3.4.0~svn10438/Libs/IGT/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/IGT/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/IGT/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/IGT/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/IGT/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -139,9 +139,14 @@
    ${TRACKING_INTERFACE_LIB}
    )
@@ -365,8 +365,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/ITKCommandIO/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/ITKCommandIO/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -71,9 +71,14 @@
    ITKIO
    )
@@ -385,8 +385,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/LoadableModule/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/LoadableModule/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -116,9 +116,14 @@
  
  target_link_libraries(${lib_name} ${link_libs})
@@ -405,8 +405,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/MGHImageIO/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/MGHImageIO/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -59,9 +59,14 @@
    ITKIO 
  )
@@ -425,8 +425,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/MRML/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/MRML/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/MRML/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/MRML/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/MRML/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -237,9 +237,14 @@
    endif(MRML_USE_vtkTeem)
  endif(MRML_USE_Teem)
@@ -445,8 +445,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/MRMLIDImageIO/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/MRMLIDImageIO/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -78,9 +78,14 @@
    vtkImaging
  )
@@ -465,8 +465,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/ModuleDescriptionParser/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/ModuleDescriptionParser/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -120,9 +120,14 @@
  
  target_link_libraries(${lib_name} ${link_libs})
@@ -485,8 +485,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/Qdec/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/Qdec/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/Qdec/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/Qdec/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/Qdec/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -76,9 +76,14 @@
    #  vtkIOTCL
    )
@@ -505,8 +505,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/Qdec/QdecContrast.cpp
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/Qdec/QdecContrast.cpp	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/Qdec/QdecContrast.cpp	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/Qdec/QdecContrast.cpp	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/Qdec/QdecContrast.cpp	2010-01-27 14:18:32.000000000 -0500
 @@ -16,6 +16,7 @@
  #include <errno.h>
  #include <sys/stat.h>
@@ -517,8 +517,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/RemoteIO/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/RemoteIO/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -11,8 +11,11 @@
  find_package(ITK REQUIRED)
  include(${ITK_USE_FILE})
@@ -556,8 +556,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/RemoteIO/vtkHTTPHandler.h	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/RemoteIO/vtkHTTPHandler.h	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h	2010-01-27 14:18:32.000000000 -0500
 @@ -5,7 +5,7 @@
  #pragma warning ( disable : 4786 )
  #endif
@@ -569,8 +569,8 @@
  #include "vtkRemoteIO.h"
 Index: slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/SlicerIO/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/SlicerIO/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -48,7 +48,7 @@
  
  install(TARGETS ${lib_name}
@@ -582,8 +582,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/vtkITK/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkITK/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/vtkITK/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/vtkITK/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/vtkITK/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -111,9 +111,14 @@
    ITKDICOMParser
    )
@@ -602,8 +602,8 @@
  
 Index: slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h	2010-01-27 14:18:32.000000000 -0500
 @@ -34,7 +34,7 @@
  #include <string>
  
@@ -615,8 +615,8 @@
  #include "gdcmGlobal.h"         // access to dictionary
 Index: slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkTeem/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/vtkTeem/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -111,9 +111,14 @@
    ${Teem_LIBRARIES}
    )
@@ -635,8 +635,8 @@
  
 Index: slicer-3.4.0~svn10438/Modules/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/CMakeLists.txt	2010-01-06 21:19:02.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -74,7 +74,7 @@
    subdirs(
      OpenIGTLinkIF
@@ -648,8 +648,8 @@
  
 Index: slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/ChangeTracker/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/ChangeTracker/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -40,8 +40,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -673,8 +673,8 @@
    ${Slicer3_Base_LIBRARIES}
 Index: slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/CommandLineModule/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/CommandLineModule/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,8 +31,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -698,8 +698,8 @@
  if(Slicer3_USE_PYTHON)
 Index: slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/EMSegment/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/EMSegment/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -44,8 +44,6 @@
    "${CMAKE_CURRENT_SOURCE_DIR}/Registration/*.h"
    )
@@ -723,8 +723,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/FetchMI/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/FetchMI/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -33,8 +33,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -748,8 +748,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,8 +31,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -773,8 +773,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Adapter/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Adapter/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -58,6 +58,11 @@
    ITKAlgorithms
    )
@@ -789,8 +789,8 @@
    LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
 Index: slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/BuildingBlock/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/BuildingBlock/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -173,6 +173,11 @@
    ITKIO
    ITKAlgorithms
@@ -805,8 +805,8 @@
  #CONFIGURE_FILE(
 Index: slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Common/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Common/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -156,6 +156,12 @@
    MRML
    )
@@ -822,8 +822,8 @@
    LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
 Index: slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Filter/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Filter/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -102,6 +102,11 @@
    ${KWWidgets_LIBRARIES}
    )
@@ -838,8 +838,8 @@
    LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
 Index: slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -44,8 +44,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -861,8 +861,8 @@
  slicer3_install_modules(${LIB_NAME})
 Index: slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/IO/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/IO/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -60,6 +60,11 @@
    vtkRendering
    )
@@ -877,8 +877,8 @@
    LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
 Index: slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Widgets/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Widgets/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -107,6 +107,11 @@
    mimxFilter
    mimxCommon
@@ -893,8 +893,8 @@
    RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries 
 Index: slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/NeuroNav/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/NeuroNav/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -40,8 +40,6 @@
    "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
    )
@@ -918,8 +918,8 @@
  
 Index: slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/OpenIGTLinkIF/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/OpenIGTLinkIF/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -40,8 +40,6 @@
    )
  
@@ -942,8 +942,8 @@
    ${Slicer3_Libs_LIBRARIES}
 Index: slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/ProstateNav/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/ProstateNav/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -17,12 +17,16 @@
  
  # --------------------------------------------------------------------------
@@ -996,8 +996,8 @@
  
 Index: slicer-3.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h	2010-01-27 14:18:32.000000000 -0500
 @@ -37,6 +37,13 @@
  class VTK_PROSTATENAV_EXPORT vtkProstateNavCalibrationStep : public vtkProstateNavStep
  {
@@ -1014,8 +1014,8 @@
    void PrintSelf(ostream& os, vtkIndent indent);
 Index: slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/QdecModule/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/QdecModule/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,8 +31,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1039,8 +1039,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/QueryAtlas/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/QueryAtlas/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -42,14 +42,11 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1096,8 +1096,8 @@
 +#endforeach(file)
 Index: slicer-3.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/RealTimeImaging/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/RealTimeImaging/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -32,7 +32,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1108,8 +1108,8 @@
    )
 Index: slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/ScriptedModule/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/ScriptedModule/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,8 +31,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1133,8 +1133,8 @@
  if(Slicer3_USE_PYTHON)
 Index: slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/SlicerDaemon/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/SlicerDaemon/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,8 +31,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1158,8 +1158,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/SlicerWelcome/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/SlicerWelcome/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -37,8 +37,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1182,8 +1182,8 @@
  
 Index: slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,8 +31,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1207,8 +1207,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Tractography/Display/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Tractography/Display/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,14 +31,11 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1236,8 +1236,8 @@
  slicer3_install_modules(${lib_name})
 Index: slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,8 +31,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1261,8 +1261,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Tractography/Seeding/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Tractography/Seeding/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,8 +31,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1286,8 +1286,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/VolumeRendering/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/VolumeRendering/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -33,8 +33,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1311,8 +1311,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -31,8 +31,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1334,8 +1334,8 @@
  slicer3_install_modules(${lib_name})
 Index: slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Volumes/CMakeLists.txt	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Modules/Volumes/CMakeLists.txt	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -37,7 +37,6 @@
  
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1358,8 +1358,8 @@
  # --------------------------------------------------------------------------
 Index: slicer-3.4.0~svn10438/Scripts/versioner.tcl
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Scripts/versioner.tcl	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Scripts/versioner.tcl	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Scripts/versioner.tcl	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Scripts/versioner.tcl	2010-01-27 14:18:32.000000000 -0500
 @@ -16,13 +16,6 @@
  
  ################################################################################
@@ -1410,8 +1410,8 @@
  close $fp
 Index: slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Utilities/Launcher/CMakeLists.txt	2010-01-06 19:01:22.000000000 -0500
-+++ slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Utilities/Launcher/CMakeLists.txt	2010-01-27 14:18:22.000000000 -0500
++++ slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt	2010-01-27 14:18:32.000000000 -0500
 @@ -40,11 +40,11 @@
  set(launcher_source
    "${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Launchers/${launcher_name}")
@@ -1428,8 +1428,8 @@
  # Should this location change, change Application/GUI/Slicer3.cxx as well
 Index: slicer-3.4.0~svn10438/launch.tcl.in
 ===================================================================
---- slicer-3.4.0~svn10438.orig/launch.tcl.in	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/launch.tcl.in	2010-01-06 21:18:25.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/launch.tcl.in	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/launch.tcl.in	2010-01-27 14:18:32.000000000 -0500
 @@ -100,7 +100,7 @@
  
  
@@ -1458,8 +1458,8 @@
  # run program until it exits and then exit this script with the ouput
 Index: slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKIslandMath.cxx
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkITK/vtkITKIslandMath.cxx	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKIslandMath.cxx	2010-01-06 21:18:26.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/vtkITK/vtkITKIslandMath.cxx	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKIslandMath.cxx	2010-01-27 14:18:32.000000000 -0500
 @@ -165,7 +165,7 @@
      void* outPtr = output->GetScalarPointer();
  
@@ -1471,8 +1471,8 @@
        vtkTemplateMacroCase(VTK_DOUBLE, double, CALL);                           \
 Index: slicer-3.4.0~svn10438/Libs/vtkTeem/vtkNRRDReader.h
 ===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkTeem/vtkNRRDReader.h	2010-01-06 19:01:23.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/vtkTeem/vtkNRRDReader.h	2010-01-06 21:24:33.000000000 -0500
+--- slicer-3.4.0~svn10438.orig/Libs/vtkTeem/vtkNRRDReader.h	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/vtkTeem/vtkNRRDReader.h	2010-01-27 14:18:32.000000000 -0500
 @@ -57,6 +57,7 @@
  #define NORMALS 3
  #define TENSORS 4
@@ -1481,3 +1481,171 @@
  class VTK_Teem_EXPORT vtkNRRDReader : public vtkMedicalImageReader2
  {
  public:
+Index: slicer-3.4.0~svn10438/Libs/vtkTeem/vtkNRRDReader.cxx
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/vtkTeem/vtkNRRDReader.cxx	2010-01-27 14:18:23.000000000 -0500
++++ slicer-3.4.0~svn10438/Libs/vtkTeem/vtkNRRDReader.cxx	2010-01-27 14:18:32.000000000 -0500
+@@ -792,6 +792,7 @@
+ 
+ int
+ vtkNRRDReader::tenSpaceDirectionReduce(Nrrd *nout, const Nrrd *nin, double SD[9]) {
++  #define BIFF_STRLEN (256+1) /* convenience for strlen of error messages */
+   char me[]="tenSpaceDirectionReduce", err[BIFF_STRLEN];
+   double SDT[9], tenMeasr[9], tenSlice[9];
+   size_t ii, nn;
+Index: slicer-3.4.0~svn10438/Modules/Meshing/Widgets/vtkMimxSelectCellsWidgetFEMesh.cxx
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Widgets/vtkMimxSelectCellsWidgetFEMesh.cxx	2010-01-27 20:24:12.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/vtkMimxSelectCellsWidgetFEMesh.cxx	2010-01-27 20:24:38.000000000 -0500
+@@ -64,6 +64,9 @@
+ #include "vtkPolyDataMapper.h"
+ #include "vtkPolyDataSource.h"
+ #include "vtkSelection.h"
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++#include "vtkSelectionNode.h"
++#endif
+ #include "vtkSphereSource.h"
+ #include "vtkVisibleCellSelector.h"
+ #include "vtkWidgetCallbackMapper.h" 
+@@ -475,12 +478,20 @@
+   vtkSelection *res = vtkSelection::New();
+   select->GetSelectedIds(res);
+ 
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++  vtkSelectionNode *cellidssel = res->GetNode(0);
++#else
+   vtkSelection *cellidssel = res->GetChild(0);
++#endif
+   vtkExtractSelectedPolyDataIds *extr = vtkExtractSelectedPolyDataIds::New();
+   if (cellidssel)
+     {
+     extr->SetInput(0, fil->GetOutput());
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++    extr->SetInput(1, res);
++#else
+     extr->SetInput(1, cellidssel);
++#endif
+     extr->Update();
+     }
+   if(extr->GetOutput()->GetNumberOfCells() < 1)
+@@ -521,9 +532,18 @@
+   self->Input->GetCellData()->AddArray(globalids);
+   self->Input->GetCellData()->SetGlobalIds(globalids);
+ 
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++  selection->RemoveAllNodes();
++  vtkSelectionNode *node = vtkSelectionNode::New();
++  selection->AddNode(node);
++  node->Delete();
++  node->GetProperties()->Set(
++    vtkSelectionNode::CONTENT_TYPE(), vtkSelectionNode::GLOBALIDS);
++#else
+   selection->Clear();
+   selection->GetProperties()->Set(
+     vtkSelection::CONTENT_TYPE(), vtkSelection::GLOBALIDS);
++#endif
+   vtkIdTypeArray *cellIds = vtkIdTypeArray::New();
+   cellIds->SetNumberOfComponents(1);
+   cellIds->SetNumberOfTuples(self->SelectedCellIds->GetNumberOfIds());
+@@ -531,7 +551,11 @@
+     {
+     cellIds->SetTuple1(i, self->SelectedCellIds->GetId(i));
+     }
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++  selection->GetNode(0)->SetSelectionList(cellIds);
++#else
+   selection->SetSelectionList(cellIds);
++#endif
+   cellIds->Delete();
+         
+   ext->Update();
+@@ -625,10 +649,18 @@
+     }
+   self->Input->GetCellData()->AddArray(globalids);
+   self->Input->GetCellData()->SetGlobalIds(globalids);
+-
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++  selection->RemoveAllNodes();
++  vtkSelectionNode *node = vtkSelectionNode::New();
++  selection->AddNode(node);
++  node->Delete();
++  node->GetProperties()->Set(
++    vtkSelectionNode::CONTENT_TYPE(), vtkSelectionNode::GLOBALIDS);
++#else
+   selection->Clear();
+   selection->GetProperties()->Set(
+     vtkSelection::CONTENT_TYPE(), vtkSelection::GLOBALIDS);
++#endif
+   vtkIdTypeArray *cellIds = vtkIdTypeArray::New();
+   cellIds->SetNumberOfComponents(1);
+   cellIds->SetNumberOfTuples(self->SelectedCellIds->GetNumberOfIds());
+@@ -636,7 +668,11 @@
+     {
+     cellIds->SetTuple1(i, self->SelectedCellIds->GetId(i));
+     }
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++  selection->GetNode(0)->SetSelectionList(cellIds);
++#else
+   selection->SetSelectionList(cellIds);
++#endif
+   cellIds->Delete();
+ 
+   ext->Update();
+@@ -911,13 +947,20 @@
+     self->CurrentRenderer->RemoveActor(self->ExtractedSurfaceActor);
+     self->ExtractedSurfaceActor->Delete();
+     }
+-
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++  vtkSelectionNode *cellids = res->GetNode(0);
++#else
+   vtkSelection *cellids = res->GetChild(0);
++#endif
+   vtkExtractSelectedPolyDataIds *extr = vtkExtractSelectedPolyDataIds::New();
+   if (cellids)
+     {
+     extr->SetInput(0, clean->GetOutput());
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++    extr->SetInput(1, res);
++#else
+     extr->SetInput(1, cellids);
++#endif
+     extr->Update();
+     self->ExtractedSurfaceActor = vtkActor::New();
+     vtkPolyDataMapper *mapper = vtkPolyDataMapper::New();
+Index: slicer-3.4.0~svn10438/Modules/Meshing/Widgets/vtkMimxCreateElementSetWidgetFEMesh.cxx
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Widgets/vtkMimxCreateElementSetWidgetFEMesh.cxx	2010-01-27 20:27:28.000000000 -0500
++++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/vtkMimxCreateElementSetWidgetFEMesh.cxx	2010-01-27 20:27:50.000000000 -0500
+@@ -62,6 +62,9 @@
+ #include "vtkPolyDataMapper.h"
+ #include "vtkPolyDataSource.h"
+ #include "vtkSelection.h"
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++#include "vtkSelectionNode.h"
++#endif
+ #include "vtkVisibleCellSelector.h"
+ #include "vtkWidgetCallbackMapper.h" 
+ #include "vtkWidgetEvent.h"
+@@ -601,13 +604,20 @@
+ 
+   vtkSelection *res = vtkSelection::New();
+   select->GetSelectedIds(res);
+-
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++  vtkSelectionNode *cellidssel = res->GetNode(0);
++#else
+   vtkSelection *cellidssel = res->GetChild(0);
++#endif
+   vtkExtractSelectedPolyDataIds *extr = vtkExtractSelectedPolyDataIds::New();
+   if (cellidssel)
+     {
+     extr->SetInput(0, fil->GetOutput());
++#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
++    extr->SetInput(1, res);
++#else
+     extr->SetInput(1, cellidssel);
++#endif
+     extr->Update();
+     }
+

More information about the debian-science-commits mailing list