r36658 - in /packages/slicer/branch/experimental/debian: changelog control get-orig-source patches/50_all_changes.diff rules slicer.install
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Mon Jun 28 23:09:26 UTC 2010
Author: domibel-guest
Date: Mon Jun 28 23:09:26 2010
New Revision: 36658
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36658
Log:
switch to 3.6
Modified:
packages/slicer/branch/experimental/debian/changelog
packages/slicer/branch/experimental/debian/control
packages/slicer/branch/experimental/debian/get-orig-source
packages/slicer/branch/experimental/debian/patches/50_all_changes.diff
packages/slicer/branch/experimental/debian/rules
packages/slicer/branch/experimental/debian/slicer.install
Modified: packages/slicer/branch/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/changelog?rev=36658&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/changelog (original)
+++ packages/slicer/branch/experimental/debian/changelog Mon Jun 28 23:09:26 2010
@@ -1,9 +1,9 @@
-slicer (3.5.0~svn12531-1) experimental; urgency=low
+slicer (3.6.0~svn13936-1) experimental; urgency=low
* Switch to dpkg-source 3.0 (quilt) format
* New snapshot
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Tue, 20 Apr 2010 02:20:49 +0000
+ -- Dominique Belhachemi <domibel at domibel.org> Tue, 20 Apr 2010 02:20:49 +0000
slicer (3.4.0~svn10133-1) experimental; urgency=low
Modified: packages/slicer/branch/experimental/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/control?rev=36658&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/control (original)
+++ packages/slicer/branch/experimental/debian/control Mon Jun 28 23:09:26 2010
@@ -2,7 +2,7 @@
Priority: optional
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>
+Uploaders: Dominique Belhachemi <domibel at domibel.org>
Build-Depends: debhelper (>= 7), quilt, cmake, tcl-dev, tk-dev, libpng-dev, libjpeg-dev,
libtiff-dev, libexpat1-dev, libinsighttoolkit3-dev, libkwwidgets1-dev, libcurl4-openssl-dev,
libfreetype6-dev, libxext-dev, libvtk5-dev (>= 5.2.0), libteem1-dev, libopenigtlink1-dev,
Modified: packages/slicer/branch/experimental/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/get-orig-source?rev=36658&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/get-orig-source (original)
+++ packages/slicer/branch/experimental/debian/get-orig-source Mon Jun 28 23:09:26 2010
@@ -19,9 +19,9 @@
FOLDER=${PACKAGE}-${VERSION}
-svn checkout --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/trunk ${FOLDER}
+#svn checkout --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/trunk ${FOLDER}
#svn export --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/trunk ${FOLDER}
-#svn export --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/branches/Slicer-3-4 ${FOLDER}
+svn export --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/branches/Slicer-3-6 ${FOLDER}
cd ${FOLDER}
#rm ./Utilities/Launcher/*.tcl
Modified: packages/slicer/branch/experimental/debian/patches/50_all_changes.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/patches/50_all_changes.diff?rev=36658&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/patches/50_all_changes.diff (original)
+++ packages/slicer/branch/experimental/debian/patches/50_all_changes.diff Mon Jun 28 23:09:26 2010
@@ -1,10 +1,10 @@
## This patch adds soname version numbers
## MRIBiasFieldCorrection is using code from review, cant compile it
-Index: slicer-3.5.0~svn12531/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-01-07 15:53:26.000000000 -0500
++++ slicer-3.6.0~svn13936/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -18,8 +18,8 @@
#
@@ -25,10 +25,10 @@
#
# Generate executable
-Index: slicer-3.5.0~svn12531/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
-===================================================================
---- slicer-3.5.0~svn12531.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-04-10 13:33:12.000000000 -0400
++++ slicer-3.6.0~svn13936/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-06-25 02:04:07.000000000 -0400
@@ -3,7 +3,7 @@
#endif
@@ -38,10 +38,10 @@
#include <itksys/SystemTools.hxx>
#include <itksys/Process.h>
#include <math.h>
-Index: slicer-3.5.0~svn12531/Applications/GUI/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Applications/GUI/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Applications/GUI/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Applications/GUI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Applications/GUI/CMakeLists.txt 2010-02-02 00:14:29.000000000 -0500
++++ slicer-3.6.0~svn13936/Applications/GUI/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -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}\"")
@@ -64,10 +64,10 @@
# --------------------------------------------------------------------------
# Include dirs
-Index: slicer-3.5.0~svn12531/Applications/GUI/Slicer3.cxx
-===================================================================
---- slicer-3.5.0~svn12531.orig/Applications/GUI/Slicer3.cxx 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Applications/GUI/Slicer3.cxx 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Applications/GUI/Slicer3.cxx
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Applications/GUI/Slicer3.cxx 2010-05-25 15:47:20.000000000 -0400
++++ slicer-3.6.0~svn13936/Applications/GUI/Slicer3.cxx 2010-06-25 02:04:07.000000000 -0400
@@ -447,7 +447,7 @@
}
@@ -77,10 +77,10 @@
vtkKWApplication::PutEnv(const_cast <char *> (tclEnv.c_str()));
// ITK factories dir
-Index: slicer-3.5.0~svn12531/Libs/FreeSurfer/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/FreeSurfer/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/FreeSurfer/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/FreeSurfer/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/FreeSurfer/CMakeLists.txt 2010-03-01 11:42:12.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/FreeSurfer/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -95,7 +95,7 @@
install(TARGETS ${lib_name}
@@ -109,10 +109,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.5.0~svn12531/Libs/IGT/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/IGT/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/IGT/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/IGT/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/IGT/CMakeLists.txt 2010-01-26 10:23:12.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/IGT/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -157,7 +157,7 @@
install(TARGETS ${lib_name}
@@ -122,10 +122,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Libs/ITKCommandIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/ITKCommandIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/ITKCommandIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/ITKCommandIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/ITKCommandIO/CMakeLists.txt 2010-01-26 10:23:12.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/ITKCommandIO/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -75,7 +75,7 @@
install(TARGETS ${lib_name}
@@ -135,10 +135,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Libs/LoadableModule/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/LoadableModule/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/LoadableModule/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/LoadableModule/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/LoadableModule/CMakeLists.txt 2009-12-08 18:34:28.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/LoadableModule/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -127,7 +127,7 @@
install(TARGETS ${lib_name}
@@ -148,10 +148,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Libs/MGHImageIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/MGHImageIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/MGHImageIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/MGHImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/MGHImageIO/CMakeLists.txt 2009-12-07 23:15:18.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/MGHImageIO/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -63,7 +63,7 @@
install(TARGETS ${lib_name}
@@ -161,11 +161,11 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Libs/MRML/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/MRML/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/MRML/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
-@@ -267,7 +267,7 @@
+Index: slicer-3.6.0~svn13936/Libs/MRML/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/MRML/CMakeLists.txt 2010-04-17 12:12:43.000000000 -0400
++++ slicer-3.6.0~svn13936/Libs/MRML/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
+@@ -268,7 +268,7 @@
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
@@ -174,7 +174,7 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-@@ -297,9 +297,16 @@
+@@ -298,9 +298,16 @@
SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES SUFFIX ".pyd")
ENDIF(WIN32 AND NOT CYGWIN)
@@ -192,10 +192,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.5.0~svn12531/Libs/MRMLIDImageIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/MRMLIDImageIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/MRMLIDImageIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/MRMLIDImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/MRMLIDImageIO/CMakeLists.txt 2010-01-26 10:23:12.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/MRMLIDImageIO/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -85,7 +85,7 @@
install(TARGETS ${lib_name}
@@ -205,23 +205,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Libs/Qdec/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/Qdec/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/Qdec/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
-@@ -87,7 +87,7 @@
-
- install(TARGETS ${lib_name}
- RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
-- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
-+ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
- )
-
-Index: slicer-3.5.0~svn12531/Libs/RemoteIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/RemoteIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/RemoteIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/RemoteIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/RemoteIO/CMakeLists.txt 2010-02-25 16:34:48.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/RemoteIO/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -13,8 +13,11 @@
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
@@ -273,10 +260,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.5.0~svn12531/Libs/RemoteIO/vtkHTTPHandler.h
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/RemoteIO/vtkHTTPHandler.h 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/RemoteIO/vtkHTTPHandler.h 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/RemoteIO/vtkHTTPHandler.h
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/RemoteIO/vtkHTTPHandler.h 2010-01-22 14:43:59.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/RemoteIO/vtkHTTPHandler.h 2010-06-25 02:04:07.000000000 -0400
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -286,10 +273,10 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
-Index: slicer-3.5.0~svn12531/Libs/SlicerIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/SlicerIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/SlicerIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/SlicerIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/SlicerIO/CMakeLists.txt 2009-12-07 23:15:18.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/SlicerIO/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -50,7 +50,7 @@
install(TARGETS ${lib_name}
@@ -299,10 +286,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Libs/vtkITK/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/vtkITK/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/vtkITK/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/vtkITK/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/vtkITK/CMakeLists.txt 2010-01-26 14:17:00.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/vtkITK/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -151,7 +151,7 @@
install(TARGETS ${lib_name}
@@ -312,10 +299,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Libs/vtkTeem/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/vtkTeem/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/vtkTeem/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/vtkTeem/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/vtkTeem/CMakeLists.txt 2010-03-01 11:42:12.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/vtkTeem/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -136,7 +136,7 @@
install(TARGETS ${lib_name}
@@ -343,10 +330,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.5.0~svn12531/Modules/ChangeTracker/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/ChangeTracker/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/ChangeTracker/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/ChangeTracker/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/ChangeTracker/CMakeLists.txt 2010-05-05 18:02:47.000000000 -0400
++++ slicer-3.6.0~svn13936/Modules/ChangeTracker/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -44,8 +44,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -356,10 +343,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/CommandLineModule/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/CommandLineModule/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/CommandLineModule/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/CommandLineModule/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/CommandLineModule/CMakeLists.txt 2010-01-12 16:51:03.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/CommandLineModule/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -369,10 +356,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/FetchMI/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/FetchMI/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/FetchMI/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/FetchMI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/FetchMI/CMakeLists.txt 2010-02-05 01:34:52.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/FetchMI/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -44,8 +44,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -382,10 +369,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2009-12-08 18:34:28.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -41,8 +41,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -395,10 +382,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/Meshing/IA_FEMesh/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/Meshing/IA_FEMesh/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2009-12-07 23:15:18.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -46,8 +46,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -408,24 +395,24 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/NeuroNav/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/NeuroNav/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/NeuroNav/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/NeuroNav/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/NeuroNav/CMakeLists.txt 2010-04-28 15:26:56.000000000 -0400
++++ slicer-3.6.0~svn13936/Modules/NeuroNav/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
+@@ -41,8 +41,6 @@
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkNeuroNavConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+Index: slicer-3.6.0~svn13936/Modules/OpenIGTLinkIF/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-04-19 14:23:51.000000000 -0400
++++ slicer-3.6.0~svn13936/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -42,8 +42,6 @@
- "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
- )
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkNeuroNavConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-Index: slicer-3.5.0~svn12531/Modules/OpenIGTLinkIF/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
-@@ -42,8 +42,6 @@
)
install(FILES
@@ -434,11 +421,11 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-04-18 13:04:16.000000000 -0400
-@@ -28,6 +28,13 @@
+Index: slicer-3.6.0~svn13936/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-06-15 21:09:43.000000000 -0400
++++ slicer-3.6.0~svn13936/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-06-25 02:04:07.000000000 -0400
+@@ -31,6 +31,13 @@
class VTK_PROSTATENAV_EXPORT vtkProstateNavCalibrationStep : public vtkProstateNavStep
{
public:
@@ -452,32 +439,11 @@
static vtkProstateNavCalibrationStep *New();
vtkTypeRevisionMacro(vtkProstateNavCalibrationStep,vtkProstateNavStep);
void PrintSelf(ostream& os, vtkIndent indent);
-Index: slicer-3.5.0~svn12531/Modules/QdecModule/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/QdecModule/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/QdecModule/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
-@@ -33,8 +33,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkQdecModuleConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -82,6 +80,7 @@
- )
- ENDIF(Slicer3_LIBRARY_PROPERTIES)
-
-+
- slicer3_install_modules(${lib_name})
-
- # --------------------------------------------------------------------------
-Index: slicer-3.5.0~svn12531/Modules/QueryAtlas/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/QueryAtlas/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/QueryAtlas/CMakeLists.txt 2010-04-18 13:06:42.000000000 -0400
-@@ -44,14 +44,11 @@
+Index: slicer-3.6.0~svn13936/Modules/QueryAtlas/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/QueryAtlas/CMakeLists.txt 2010-05-03 11:06:08.000000000 -0400
++++ slicer-3.6.0~svn13936/Modules/QueryAtlas/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
+@@ -42,14 +42,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
install(FILES
@@ -492,7 +458,7 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-@@ -206,14 +203,14 @@
+@@ -203,14 +200,14 @@
OntologyViz/extjars/prefuse.jar
)
@@ -518,10 +484,10 @@
+# DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${path} COMPONENT Development
+# )
+#endforeach(file)
-Index: slicer-3.5.0~svn12531/Modules/RealTimeImaging/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/RealTimeImaging/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/RealTimeImaging/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/RealTimeImaging/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/RealTimeImaging/CMakeLists.txt 2009-12-07 23:15:18.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/RealTimeImaging/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -34,7 +34,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -530,10 +496,10 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkRealTimeImagingConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/ScriptedModule/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/ScriptedModule/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/ScriptedModule/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/ScriptedModule/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/ScriptedModule/CMakeLists.txt 2009-12-08 18:34:28.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/ScriptedModule/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -551,10 +517,10 @@
# Python settings
if(Slicer3_USE_PYTHON)
-Index: slicer-3.5.0~svn12531/Modules/SlicerDaemon/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/SlicerDaemon/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/SlicerDaemon/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/SlicerDaemon/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/SlicerDaemon/CMakeLists.txt 2009-12-08 18:34:28.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/SlicerDaemon/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -572,10 +538,10 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.5.0~svn12531/Modules/SlicerWelcome/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/SlicerWelcome/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/SlicerWelcome/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/SlicerWelcome/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/SlicerWelcome/CMakeLists.txt 2010-03-19 14:48:21.000000000 -0400
++++ slicer-3.6.0~svn13936/Modules/SlicerWelcome/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -39,8 +39,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -585,10 +551,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/Statistics/LabelStatistics/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/Statistics/LabelStatistics/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt 2009-12-08 18:34:28.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -598,10 +564,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/Tractography/Display/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/Tractography/Display/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/Tractography/Display/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/Tractography/Display/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/Tractography/Display/CMakeLists.txt 2009-12-07 23:15:18.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/Tractography/Display/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -33,14 +33,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -617,10 +583,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/Tractography/FiducialSeeding/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/Tractography/FiducialSeeding/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-02-01 02:13:13.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -35,8 +35,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -638,10 +604,10 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.5.0~svn12531/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-12-07 23:15:18.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -651,10 +617,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/Volumes/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/Volumes/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/Volumes/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/Volumes/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/Volumes/CMakeLists.txt 2010-02-04 23:39:25.000000000 -0500
++++ slicer-3.6.0~svn13936/Modules/Volumes/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -48,7 +48,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -663,10 +629,10 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkVolumesConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Scripts/versioner.tcl
-===================================================================
---- slicer-3.5.0~svn12531.orig/Scripts/versioner.tcl 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Scripts/versioner.tcl 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Scripts/versioner.tcl
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Scripts/versioner.tcl 2009-10-23 15:58:51.000000000 -0400
++++ slicer-3.6.0~svn13936/Scripts/versioner.tcl 2010-06-25 02:04:07.000000000 -0400
@@ -14,15 +14,6 @@
# Initiated - sp - 2009-03-24
#
@@ -720,11 +686,11 @@
set versionFile $::Slicer3_BUILD/lib/Slicer3/Slicer3Version.txt
puts "Writing version information to $versionFile"
-Index: slicer-3.5.0~svn12531/Applications/CLI/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Applications/CLI/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Applications/CLI/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
-@@ -309,7 +309,7 @@
+Index: slicer-3.6.0~svn13936/Applications/CLI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Applications/CLI/CMakeLists.txt 2010-05-24 11:12:26.000000000 -0400
++++ slicer-3.6.0~svn13936/Applications/CLI/CMakeLists.txt 2010-06-25 23:20:55.000000000 -0400
+@@ -313,7 +313,7 @@
slicer3_set_plugins_output_path(${CLP})
target_link_libraries (${CLP} ${CLP}Lib)
#####################
@@ -733,16 +699,24 @@
#####################
# set (CLP DWIDicomLoad)
-@@ -665,7 +665,7 @@
-
- ##BRAINSDemonWarp
+@@ -679,14 +679,14 @@
+ ###################
+
SET(cli_modules
- MRIBiasFieldCorrection
+# MRIBiasFieldCorrection
SparseFieldLevelSetContour
Realign
DiffusionApplications
-@@ -680,11 +680,11 @@
+ #EndoNavTracking
+ ExtractSkeleton
+ #Java
+- N4ITKBiasFieldCorrection
++# N4ITKBiasFieldCorrection
+ RobustStatisticsSegmenter
+ )
+
+@@ -696,11 +696,11 @@
else ( ${ITK_VERSION_MAJOR} GREATER 3 )
@@ -756,7 +730,7 @@
if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
if ( ITK_USE_OPTIMIZED_REGISTRATION_METHODS )
-@@ -696,7 +696,7 @@
+@@ -712,7 +712,7 @@
message ("RegisterImagesModule requires ITK version 3.8 or higher")
endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
@@ -765,10 +739,10 @@
endif ( ${ITK_VERSION_MAJOR} GREATER 3 )
-Index: slicer-3.5.0~svn12531/Modules/Meshing/Filter/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/Meshing/Filter/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/Meshing/Filter/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Modules/Meshing/Filter/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/Meshing/Filter/CMakeLists.txt 2009-10-29 18:36:10.000000000 -0400
++++ slicer-3.6.0~svn13936/Modules/Meshing/Filter/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -95,6 +95,13 @@
mimxCommon
)
@@ -783,10 +757,10 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.5.0~svn12531/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/CMakeLists.txt 2010-06-04 11:09:59.000000000 -0400
++++ slicer-3.6.0~svn13936/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -29,6 +29,11 @@
set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
@@ -799,7 +773,7 @@
#-----------------------------------------------------------------------------
# Disable the warnings that DevStudio 2005 emits wrt to sprintf, strcpu, etc.
#
-@@ -289,10 +294,11 @@
+@@ -295,10 +300,11 @@
#-----------------------------------------------------------------------------
## SlicerLibCurl
@@ -815,7 +789,7 @@
#-----------------------------------------------------------------------------
## BatchMake
-@@ -311,7 +317,7 @@
+@@ -317,7 +323,7 @@
option(Slicer3_USE_OPENIGTLINK "Build Slicer3 with OpenIGTLink support." OFF)
if(Slicer3_USE_OPENIGTLINK)
find_package(OpenIGTLink REQUIRED)
@@ -824,10 +798,10 @@
endif(Slicer3_USE_OPENIGTLINK)
#-----------------------------------------------------------------------------
-Index: slicer-3.5.0~svn12531/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-01-22 14:45:00.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-06-25 02:04:07.000000000 -0400
@@ -34,7 +34,7 @@
#include <string>
@@ -837,11 +811,11 @@
#include "gdcmDict.h" /// access to dictionary
#include "gdcmDictEntry.h" /// access to dictionary
#include "gdcmGlobal.h" /// access to dictionary
-Index: slicer-3.5.0~svn12531/Libs/MRML/vtkMRMLCameraNode.cxx
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/MRML/vtkMRMLCameraNode.cxx 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/MRML/vtkMRMLCameraNode.cxx 2010-04-18 13:04:16.000000000 -0400
-@@ -76,7 +76,11 @@
+Index: slicer-3.6.0~svn13936/Libs/MRML/vtkMRMLCameraNode.cxx
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/MRML/vtkMRMLCameraNode.cxx 2010-05-21 17:03:26.000000000 -0400
++++ slicer-3.6.0~svn13936/Libs/MRML/vtkMRMLCameraNode.cxx 2010-06-25 02:04:07.000000000 -0400
+@@ -77,7 +77,11 @@
{
if (this->Camera)
{
@@ -853,7 +827,7 @@
}
this->SetAndObserveCamera(NULL);
delete [] this->InternalActiveTag;
-@@ -290,12 +294,21 @@
+@@ -291,12 +295,21 @@
tnode == vtkMRMLTransformNode::SafeDownCast(caller) &&
event == vtkMRMLTransformableNode::TransformModifiedEvent)
{
@@ -875,26 +849,11 @@
+#endif
user_transform->Delete();
}
- vtkMatrix4x4* transformToWorld = vtkMatrix4x4::New();
-Index: slicer-3.5.0~svn12531/Modules/PETCTFusion/vtkPETCTFusionLogic.cxx
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/PETCTFusion/vtkPETCTFusionLogic.cxx 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/PETCTFusion/vtkPETCTFusionLogic.cxx 2010-04-18 13:04:16.000000000 -0400
-@@ -25,8 +25,8 @@
- #include "itkImageSeriesReader.h"
- #include "vtkGlobFileNames.h"
- #include "gdcmFile.h"
--#include "gdcmSeqEntry.h"
--#include "gdcmSQItem.h"
-+//#include "gdcmSeqEntry.h"
-+//#include "gdcmSQItem.h"
-
- #include "vtkPETCTFusionLogic.h"
- #include "vtkPETCTFusion.h"
-Index: slicer-3.5.0~svn12531/CMake/Slicer3FindQT.cmake
-===================================================================
---- slicer-3.5.0~svn12531.orig/CMake/Slicer3FindQT.cmake 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/CMake/Slicer3FindQT.cmake 2010-04-18 13:04:16.000000000 -0400
+ vtkSmartPointer<vtkMatrix4x4> transformToWorld = vtkSmartPointer<vtkMatrix4x4>::New();
+Index: slicer-3.6.0~svn13936/CMake/Slicer3FindQT.cmake
+===================================================================
+--- slicer-3.6.0~svn13936.orig/CMake/Slicer3FindQT.cmake 2010-02-10 22:40:44.000000000 -0500
++++ slicer-3.6.0~svn13936/CMake/Slicer3FindQT.cmake 2010-06-25 02:04:07.000000000 -0400
@@ -9,37 +9,37 @@
IF(Slicer3_USE_QT)
@@ -948,10 +907,10 @@
ENDIF(Slicer3_USE_QT)
ENDMACRO(Slicer3_SETUP_QT)
-Index: slicer-3.5.0~svn12531/Libs/MRMLCLI/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/MRMLCLI/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/MRMLCLI/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/MRMLCLI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/MRMLCLI/CMakeLists.txt 2010-01-27 17:37:21.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/MRMLCLI/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -103,7 +103,7 @@
INSTALL(TARGETS ${lib_name}
@@ -961,10 +920,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Utilities/Launcher/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Utilities/Launcher/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Utilities/Launcher/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Utilities/Launcher/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Utilities/Launcher/CMakeLists.txt 2010-02-02 00:14:29.000000000 -0500
++++ slicer-3.6.0~svn13936/Utilities/Launcher/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -39,7 +39,7 @@
"${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Launchers/${launcher_name}")
@@ -983,10 +942,10 @@
endif(EXISTS "${launcher_source}")
# Should this location change, change Application/GUI/Slicer3.cxx as well
-Index: slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-02-01 10:59:25.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -13,10 +13,10 @@
include(${ModuleDescriptionParser_USE_FILE})
endif(ModuleDescriptionParser_FOUND)
@@ -1002,10 +961,10 @@
find_package(ITK REQUIRED)
if(ITK_FOUND)
-Index: slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2009-09-08 16:52:14.000000000 -0400
++++ slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-06-25 02:04:07.000000000 -0400
@@ -5,10 +5,10 @@
message(FATAL_ERROR "Cannot build without ITK. Please set ITK_DIR.")
endif(ITK_FOUND)
@@ -1021,10 +980,10 @@
find_package(ModuleDescriptionParser REQUIRED)
if(ModuleDescriptionParser_FOUND)
-Index: slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-01-29 15:33:27.000000000 -0500
++++ slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -132,7 +132,7 @@
install(TARGETS ${lib_name}
@@ -1034,11 +993,11 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12531/Modules/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Modules/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Modules/CMakeLists.txt 2010-04-18 13:06:01.000000000 -0400
-@@ -61,7 +61,7 @@
+Index: slicer-3.6.0~svn13936/Modules/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Modules/CMakeLists.txt 2010-05-21 16:58:01.000000000 -0400
++++ slicer-3.6.0~svn13936/Modules/CMakeLists.txt 2010-06-25 23:18:34.000000000 -0400
+@@ -63,14 +63,14 @@
Tractography
# TumorGrowth
Volumes
@@ -1047,7 +1006,15 @@
VolumeRendering
# VolumeRendering1 <- merged into VolumeRendering
# WFEngineModule <- can't work with 2.6 and Win32??
-@@ -79,7 +79,7 @@
+ # MRAblation <- not working either
+ ModelMirror
+ ModelTransform
+- EMSegment
++# EMSegment
+ # DistanceTransformModel <- culled from slicer 3.6
+ ClipModel
+ Measurements
+@@ -82,7 +82,7 @@
# ExtractSubvolumeROI <- renamed to CropVolume
CropVolume
CollectFiducials
@@ -1056,7 +1023,7 @@
IGTToolSelector
)
-@@ -88,7 +88,7 @@
+@@ -91,7 +91,7 @@
${modules}
OpenIGTLinkIF
NeuroNav
@@ -1065,10 +1032,10 @@
# IGTNavigation
# OpenCV
)
-Index: slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12531.orig/Libs/SlicerExecutionModel/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
-+++ slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+Index: slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/CMakeLists.txt
+===================================================================
+--- slicer-3.6.0~svn13936.orig/Libs/SlicerExecutionModel/CMakeLists.txt 2010-03-28 12:13:08.000000000 -0400
++++ slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/CMakeLists.txt 2010-06-25 02:04:07.000000000 -0400
@@ -30,8 +30,8 @@
###
Modified: packages/slicer/branch/experimental/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/rules?rev=36658&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/rules (original)
+++ packages/slicer/branch/experimental/debian/rules Mon Jun 28 23:09:26 2010
@@ -102,7 +102,6 @@
cd $(SHARED_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# remove empty directories
- rmdir $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/EMSegment/Testing/TestData/TutorialTest2/VolumeData/Working/
rmdir $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/ModelIntoLabelVolume/Testing/TestData/
rmdir $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/ModelIntoLabelVolume/Testing/
rmdir $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/ModelIntoLabelVolume/
@@ -117,7 +116,7 @@
chmod +x $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/QueryAtlas/Tcl/QueryAtlasFips2Mrml.tcl
chmod -x $(CURDIR)/Utilities/Launcher/3DSlicerLogoICOimages/3DSlicerLogo-DesktopIcon-48x48x256.png
- dh_install --sourcedir=$(CURDIR)/debian/tmp --fail-missing
+ dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
touch $@
Modified: packages/slicer/branch/experimental/debian/slicer.install
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/slicer.install?rev=36658&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/slicer.install (original)
+++ packages/slicer/branch/experimental/debian/slicer.install Mon Jun 28 23:09:26 2010
@@ -1,7 +1,7 @@
usr/lib/Slicer3/Slicer3Version.txt
usr/lib/Slicer3/Modules/Editor
usr/lib/Slicer3/Modules/FastMarchingSegmentation
-usr/lib/Slicer3/Modules/DistanceTransformModel
+#usr/lib/Slicer3/Modules/DistanceTransformModel
#usr/lib/Slicer3/Modules/ExtractSubvolumeROI
usr/lib/Slicer3/Modules/SlicerDaemon
usr/lib/Slicer3/Modules/ScriptedModuleExample
@@ -11,7 +11,7 @@
usr/lib/Slicer3/Plugins/ExtractSkeleton
usr/lib/Slicer3/Plugins/ResampleDTI
usr/lib/Slicer3/Plugins/ExecutionModelTour
-usr/lib/Slicer3/Plugins/DemonsRegistration
+#usr/lib/Slicer3/Plugins/DemonsRegistration
usr/lib/Slicer3/Plugins/VotingBinaryHoleFillingImageFilter
usr/lib/Slicer3/Plugins/ModelMaker
usr/lib/Slicer3/Plugins/DiffusionTensorEstimation
@@ -21,7 +21,7 @@
usr/lib/Slicer3/Plugins/Mask
usr/lib/Slicer3/Plugins/Seeding
usr/lib/Slicer3/Plugins/OtsuThresholdImageFilter
-usr/lib/Slicer3/Plugins/UtahBSplineDeformableRegistration
+#usr/lib/Slicer3/Plugins/UtahBSplineDeformableRegistration
usr/lib/Slicer3/Plugins/jointLMMSE
usr/lib/Slicer3/Plugins/OrientImage
usr/lib/Slicer3/Plugins/Subtract
@@ -29,12 +29,12 @@
usr/lib/Slicer3/Plugins/RigidRegistration
usr/lib/Slicer3/Plugins/dwiNoiseFilter
usr/lib/Slicer3/Plugins/CurvatureAnisotropicDiffusion
-usr/lib/Slicer3/Plugins/ZeroCrossingBasedEdgeDetectionImageFilter
+#usr/lib/Slicer3/Plugins/ZeroCrossingBasedEdgeDetectionImageFilter
usr/lib/Slicer3/Plugins/ConfidenceConnected
usr/lib/Slicer3/Plugins/OtsuThresholdSegmentation
usr/lib/Slicer3/Plugins/SparseFieldLevelSetContour
usr/lib/Slicer3/Plugins/ResampleVolume2
-usr/lib/Slicer3/Plugins/EMSegmentCommandLine
+#usr/lib/Slicer3/Plugins/EMSegmentCommandLine
usr/lib/Slicer3/Plugins/Add
usr/lib/Slicer3/Plugins/ImageReadDicomWrite
usr/lib/Slicer3/Plugins/AffineRegistration
@@ -43,7 +43,7 @@
usr/lib/Slicer3/Plugins/GaussianBlurImageFilter
usr/lib/Slicer3/Plugins/GrayscaleFillHoleImageFilter
usr/lib/Slicer3/Plugins/DiffusionTensorMathematics
-usr/lib/Slicer3/Plugins/EMSegmentCommandLine_GUIVersion
+#usr/lib/Slicer3/Plugins/EMSegmentCommandLine_GUIVersion
usr/lib/Slicer3/Plugins/MedianImageFilter
usr/lib/Slicer3/Plugins/GradientAnisotropicDiffusion
usr/lib/Slicer3/Plugins/GrayscaleGrindPeakImageFilter
@@ -52,7 +52,7 @@
usr/lib/Slicer3/Plugins/LinearRegistration
usr/lib/Slicer3/Plugins/Threshold
usr/lib/Slicer3/Plugins/BSplineDeformableRegistration
-usr/lib/Slicer3/Plugins/FreesurferSurfaceSectionExtraction
+#usr/lib/Slicer3/Plugins/FreesurferSurfaceSectionExtraction
usr/lib/Slicer3/Plugins/ImageLabelCombine
usr/lib/Slicer3/Plugins/dwiUNLM
usr/lib/Slicer3/Plugins/DownloadSlicerTutorials
@@ -63,7 +63,7 @@
usr/bin/GenerateLM
usr/bin/GenerateCLPLauncher
usr/lib/Slicer3/launch.tcl
-usr/lib/Qdec/vtkFreeSurferReaders.tcl
+#usr/lib/Qdec/vtkFreeSurferReaders.tcl
usr/lib/Slicer3/Modules/FetchMI/Tcl/FetchMIXMLUtilities.tcl
usr/lib/Slicer3/Modules/lib*.so.*
../../Utilities/Launcher/3DSlicerLogoICOimages/3DSlicerLogo-DesktopIcon-48x48x256.png usr/share/pixmaps
More information about the debian-science-commits
mailing list