r36084 - in /packages/slicer/trunk/debian: README.Debian changelog get-orig-source patches/50_all_changes.diff patches/series
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Thu Jan 7 04:04:09 UTC 2010
Author: domibel-guest
Date: Thu Jan 7 04:04:04 2010
New Revision: 36084
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36084
Log:
tweak patches
Modified:
packages/slicer/trunk/debian/README.Debian
packages/slicer/trunk/debian/changelog
packages/slicer/trunk/debian/get-orig-source
packages/slicer/trunk/debian/patches/50_all_changes.diff
packages/slicer/trunk/debian/patches/series
Modified: packages/slicer/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/README.Debian?rev=36084&op=diff
==============================================================================
--- packages/slicer/trunk/debian/README.Debian (original)
+++ packages/slicer/trunk/debian/README.Debian Thu Jan 7 04:04:04 2010
@@ -3,4 +3,9 @@
This package does not use slicerlibcurl. Instead it uses curl from the Debian repositories.
+
+MRML stands for Medical Reality Modeling Language and has nothing to do with
+the libmrml1-dev package which is used for the Multimedia Retrieval Markup Language.
+
+
-- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 22 Mar 2008 10:08:42 +0000
Modified: packages/slicer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/changelog?rev=36084&op=diff
==============================================================================
--- packages/slicer/trunk/debian/changelog (original)
+++ packages/slicer/trunk/debian/changelog Thu Jan 7 04:04:04 2010
@@ -1,3 +1,29 @@
+slicer (3.4.0~svn10438-4) unstable; urgency=low
+
+ * Add build deps: libmysqlclient-dev, libgl2ps-dev, libavcodec-dev, libpq-dev,
+ libswscale-dev, default-jdk, mpi-default-dev, libavformat-dev
+ (Closes: #562351)
+ * Fixed strrchr/<cstring> issue
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Wed, 06 Jan 2010 22:06:38 -0500
+
+slicer (3.4.0~svn10438-3) unstable; urgency=low
+
+ * Keep RegisterImages deactivated
+ * skipping itkConceptChecking (Closes: #549790)
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Mon, 28 Sep 2009 20:57:12 -0400
+
+slicer (3.4.0~svn10438-2) unstable; urgency=low
+
+ * debian/control: Conflicts entry added (Closes: #547505)
+ libslicer3-dev conflicts with libmrml1-dev now
+ * Using CMake's include_directories instead of include
+ to fix a build error on kFreeBSD
+ * quilt patch file added to cherry pick upstream's SVN changes
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Mon, 21 Sep 2009 14:16:02 -0400
+
slicer (3.4.0~svn10438-1) unstable; urgency=low
* switch to Tcl/Tk 8.5
Modified: packages/slicer/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/get-orig-source?rev=36084&op=diff
==============================================================================
--- packages/slicer/trunk/debian/get-orig-source (original)
+++ packages/slicer/trunk/debian/get-orig-source Thu Jan 7 04:04:04 2010
@@ -11,7 +11,7 @@
fi
REVISION=`echo $VERSION | sed -e 's/^.*svn//g'`
-#REVISION=10438
+#REVISION=10509
FOLDER=${PACKAGE}-${VERSION}
if [ -z ${TARFILE}]; then
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=36084&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.diff (original)
+++ packages/slicer/trunk/debian/patches/50_all_changes.diff Thu Jan 7 04:04:04 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 2009-09-16 09:30:32.000000000 -0400
-+++ slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -269,34 +269,6 @@
target_link_libraries (${CLP}Lib ITKIO ITKBasicFilters)
@@ -48,12 +48,12 @@
else ( ${ITK_VERSION_MAJOR} GREATER 3 )
- if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
-+ if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 14 )
++ if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 16 )
subdirs( RegisterImagesModule )
- else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
-+ else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 14 )
++ else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 16 )
if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
if ( ITK_USE_OPTIMIZED_REGISTRATION_METHODS )
@@ -62,7 +62,7 @@
endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
- endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
-+ endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 14 )
++ endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 16 )
endif ( ${ITK_VERSION_MAJOR} GREATER 3 )
@@ -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 2009-09-16 09:30:32.000000000 -0400
-+++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -18,8 +18,8 @@
#
@@ -88,7 +88,7 @@
-find_package(SLICERLIBCURL REQUIRED)
-include(${SLICERLIBCURL_USE_FILE})
+find_package(CURL REQUIRED)
-+include(${CURL_INCLUDE_DIRS})
++include_directories(${CURL_INCLUDE_DIRS})
#
# Find GenerateCLP
@@ -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 2009-09-16 09:30:32.000000000 -0400
-+++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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}\"")
@@ -145,14 +145,14 @@
+#find_package(SLICERLIBCURL REQUIRED)
+#include(${SLICERLIBCURL_USE_FILE})
+find_package(CURL REQUIRED)
-+include(${CURL_INCLUDE_DIRS})
++include_directories(${CURL_INCLUDE_DIRS})
# --------------------------------------------------------------------------
# Include dirs
Index: slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx
===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/GUI/Slicer3.cxx 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:32.000000000 -0400
-+++ slicer-3.4.0~svn10438/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:34.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/IGT/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/MRML/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/Qdec/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/Qdec/QdecContrast.cpp 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/vtkITK/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Scripts/versioner.tcl 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:32.000000000 -0400
-+++ slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -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 2009-09-16 09:30:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/launch.tcl.in 2009-09-16 09:32:20.000000000 -0400
+--- 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
@@ -100,7 +100,7 @@
@@ -1456,3 +1456,28 @@
#
# 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
+@@ -165,7 +165,7 @@
+ void* outPtr = output->GetScalarPointer();
+
+ #if (ITK_VERSION_MAJOR > 3) || \
+- ((ITK_VERSION_MAJOR == 3 && ITK_VERSION_MINOR >= 14))
++ ((ITK_VERSION_MAJOR == 3 && ITK_VERSION_MINOR >= 18))
+ switch (inScalars->GetDataType())
+ {
+ 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
+@@ -57,6 +57,7 @@
+ #define NORMALS 3
+ #define TENSORS 4
+
++
+ class VTK_Teem_EXPORT vtkNRRDReader : public vtkMedicalImageReader2
+ {
+ public:
Modified: packages/slicer/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/series?rev=36084&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/series (original)
+++ packages/slicer/trunk/debian/patches/series Thu Jan 7 04:04:04 2010
@@ -1,1 +1,2 @@
+20_svn.diff
50_all_changes.diff
More information about the debian-science-commits
mailing list