r35626 - in /packages/slicer/trunk/debian: changelog control get-orig-source patches/50_all_changes.dpatch rules
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Sun Apr 5 21:40:47 UTC 2009
Author: domibel-guest
Date: Sun Apr 5 21:40:47 2009
New Revision: 35626
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35626
Log:
preparation for 3.3
Modified:
packages/slicer/trunk/debian/changelog
packages/slicer/trunk/debian/control
packages/slicer/trunk/debian/get-orig-source
packages/slicer/trunk/debian/patches/50_all_changes.dpatch
packages/slicer/trunk/debian/rules
Modified: packages/slicer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/changelog?rev=35626&op=diff
==============================================================================
--- packages/slicer/trunk/debian/changelog (original)
+++ packages/slicer/trunk/debian/changelog Sun Apr 5 21:40:47 2009
@@ -1,4 +1,4 @@
-slicer (3.3.0~svn8934-1) unstable; urgency=low
+slicer (3.3.0~svn9040-1) unstable; urgency=low
* Initial release (Closes: #500841)
Modified: packages/slicer/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/control?rev=35626&op=diff
==============================================================================
--- packages/slicer/trunk/debian/control (original)
+++ packages/slicer/trunk/debian/control Sun Apr 5 21:40:47 2009
@@ -5,7 +5,7 @@
Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
Build-Depends: dpatch, debhelper (>= 7), cmake, tcl8.4-dev, tk8.4-dev, libpng-dev, libjpeg-dev,
libtiff-dev, libexpat1-dev, libinsighttoolkit3-dev, libkwwidgets1-dev, libcurl4-openssl-dev,
- libfreetype6-dev, libxext-dev, libvtk5-dev, libteem1-dev
+ libfreetype6-dev, libxext-dev, libvtk5-dev, libteem1-dev, libopenigtlink1-dev
Build-Depends-Indep: doxygen, graphviz
Standards-Version: 3.8.1
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/?rev=0&sc=0
Modified: packages/slicer/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/get-orig-source?rev=35626&op=diff
==============================================================================
--- packages/slicer/trunk/debian/get-orig-source (original)
+++ packages/slicer/trunk/debian/get-orig-source Sun Apr 5 21:40:47 2009
@@ -1,20 +1,14 @@
+#!/bin/sh
+set -ex
+
+PACKAGE=slicer
VERSION=3.3.0
-PACKAGE=slicer
-REVISION=8934
+REVISION=9040
-svn checkout -r $REVISION http://svn.slicer.org/Slicer3/trunk trunk
+TARFILE=${PACKAGE}_${VERSION}~svn${REVISION}.orig.tar.gz
+FOLDER=${PACKAGE}-${VERSION}~svn${REVISION}
-#find Slicer3-3/ -depth -type d -name ".svn" | xargs rm -rf
-find trunk/ -depth -type d -name ".svn" | xargs rm -rf
+svn export --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/trunk ${FOLDER}
-#TARFILE=slicer_$VERSION.orig.tar.gz
-#FOLDER=$PACKAGE-$VERSION
-
-TARFILE=slicer_$VERSION~svn$REVISION.orig.tar.gz
-FOLDER=$PACKAGE-$VERSION~svn$REVISION
-
-#mv Slicer3-3 $FOLDER
-mv trunk $FOLDER
-
-tar cvzf $TARFILE $FOLDER
-#rm -rf $FOLDER
+GZIP=-9 tar czf ${TARFILE} ${FOLDER}
+rm -rf ${FOLDER}
Modified: packages/slicer/trunk/debian/patches/50_all_changes.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/50_all_changes.dpatch?rev=35626&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.dpatch (original)
+++ packages/slicer/trunk/debian/patches/50_all_changes.dpatch Sun Apr 5 21:40:47 2009
@@ -5,9 +5,9 @@
## DP: This patch adds soname version numbers
@DPATCH@
-diff -urNad slicer-3.3.0~svn8934~/Applications/CLI/CMakeLists.txt slicer-3.3.0~svn8934/Applications/CLI/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Applications/CLI/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Applications/CLI/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Applications/CLI/CMakeLists.txt slicer-3.3.0~svn9040/Applications/CLI/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Applications/CLI/CMakeLists.txt 2009-03-18 02:36:21.000000000 +0000
++++ slicer-3.3.0~svn9040/Applications/CLI/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -570,7 +570,7 @@
# subdirs( EndoNavTracking )
subdirs( ExtractSkeleton )
@@ -17,9 +17,9 @@
endif( ${ITK_VERSION_MAJOR} GREATER 3 OR ${ITK_VERSION_MINOR} GREATER 6 )
#subdirs( UtahBSpline )
subdirs( DiffeomorphicDemonsRegistration )
-diff -urNad slicer-3.3.0~svn8934~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt slicer-3.3.0~svn8934/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt slicer-3.3.0~svn9040/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2008-06-24 22:14:09.000000000 +0000
++++ slicer-3.3.0~svn9040/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -18,8 +18,8 @@
#
@@ -49,9 +49,9 @@
#
# Move exec and module to where Slicer can find them
-diff -urNad slicer-3.3.0~svn8934~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx slicer-3.3.0~svn8934/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
---- slicer-3.3.0~svn8934~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx slicer-3.3.0~svn9040/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
+--- slicer-3.3.0~svn9040~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2007-09-21 17:56:48.000000000 +0000
++++ slicer-3.3.0~svn9040/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-04-04 02:02:42.000000000 +0000
@@ -3,7 +3,7 @@
#endif
@@ -61,9 +61,9 @@
#include <itksys/SystemTools.hxx>
#include <itksys/Process.h>
#include <math.h>
-diff -urNad slicer-3.3.0~svn8934~/Applications/GUI/CMakeLists.txt slicer-3.3.0~svn8934/Applications/GUI/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Applications/GUI/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Applications/GUI/CMakeLists.txt 2009-03-25 20:36:54.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Applications/GUI/CMakeLists.txt slicer-3.3.0~svn9040/Applications/GUI/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Applications/GUI/CMakeLists.txt 2009-02-11 22:48:16.000000000 +0000
++++ slicer-3.3.0~svn9040/Applications/GUI/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -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}\"")
@@ -86,9 +86,9 @@
# --------------------------------------------------------------------------
# Include dirs
-diff -urNad slicer-3.3.0~svn8934~/Applications/GUI/Slicer3.cxx slicer-3.3.0~svn8934/Applications/GUI/Slicer3.cxx
---- slicer-3.3.0~svn8934~/Applications/GUI/Slicer3.cxx 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Applications/GUI/Slicer3.cxx 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Applications/GUI/Slicer3.cxx slicer-3.3.0~svn9040/Applications/GUI/Slicer3.cxx
+--- slicer-3.3.0~svn9040~/Applications/GUI/Slicer3.cxx 2009-04-03 10:11:14.000000000 +0000
++++ slicer-3.3.0~svn9040/Applications/GUI/Slicer3.cxx 2009-04-04 02:02:42.000000000 +0000
@@ -410,7 +410,7 @@
}
@@ -98,9 +98,9 @@
vtkKWApplication::PutEnv(const_cast <char *> (tclEnv.c_str()));
// ITK factories dir
-diff -urNad slicer-3.3.0~svn8934~/Base/CLI/CMakeLists.txt slicer-3.3.0~svn8934/Base/CLI/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Base/CLI/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Base/CLI/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Base/CLI/CMakeLists.txt slicer-3.3.0~svn9040/Base/CLI/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Base/CLI/CMakeLists.txt 2008-05-20 07:31:33.000000000 +0000
++++ slicer-3.3.0~svn9040/Base/CLI/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -58,6 +58,11 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} SlicerBaseCLI)
@@ -113,9 +113,9 @@
install(TARGETS SlicerBaseCLI
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8934~/Base/GUI/CMakeLists.txt slicer-3.3.0~svn8934/Base/GUI/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Base/GUI/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Base/GUI/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Base/GUI/CMakeLists.txt slicer-3.3.0~svn9040/Base/GUI/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Base/GUI/CMakeLists.txt 2009-03-16 15:34:28.000000000 +0000
++++ slicer-3.3.0~svn9040/Base/GUI/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -177,6 +177,11 @@
RemoteIO
)
@@ -128,9 +128,9 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
-diff -urNad slicer-3.3.0~svn8934~/Base/Logic/CMakeLists.txt slicer-3.3.0~svn8934/Base/Logic/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Base/Logic/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Base/Logic/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Base/Logic/CMakeLists.txt slicer-3.3.0~svn9040/Base/Logic/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Base/Logic/CMakeLists.txt 2008-11-05 19:25:28.000000000 +0000
++++ slicer-3.3.0~svn9040/Base/Logic/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -115,6 +115,11 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
@@ -143,9 +143,9 @@
install(TARGETS ${lib_name}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8934~/CMakeLists.txt slicer-3.3.0~svn8934/CMakeLists.txt
---- slicer-3.3.0~svn8934~/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/CMakeLists.txt slicer-3.3.0~svn9040/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/CMakeLists.txt 2008-11-11 15:43:01.000000000 +0000
++++ slicer-3.3.0~svn9040/CMakeLists.txt 2009-04-04 02:11:58.000000000 +0000
@@ -27,6 +27,11 @@
set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
@@ -188,9 +188,18 @@
## BatchMake
option(Slicer3_USE_BatchMake "Build Slicer3 with BatchMake support." OFF)
-diff -urNad slicer-3.3.0~svn8934~/Libs/FreeSurfer/CMakeLists.txt slicer-3.3.0~svn8934/Libs/FreeSurfer/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/FreeSurfer/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/FreeSurfer/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+@@ -178,7 +191,7 @@
+ option(Slicer3_USE_OPENIGTLINK "Build Slicer3 with OpenIGTLink support." OFF)
+ if(Slicer3_USE_OPENIGTLINK)
+ find_package(OpenIGTLink REQUIRED)
+- include(${OpenIGTLink_USE_FILE})
++ include_directories(${OpenIGTLink_INCLUDE_DIRS})
+ endif(Slicer3_USE_OPENIGTLINK)
+
+ #-----------------------------------------------------------------------------
+diff -urNad slicer-3.3.0~svn9040~/Libs/FreeSurfer/CMakeLists.txt slicer-3.3.0~svn9040/Libs/FreeSurfer/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/FreeSurfer/CMakeLists.txt 2008-05-21 23:25:36.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/FreeSurfer/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -68,9 +68,14 @@
vtkIOTCL
)
@@ -207,9 +216,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/IGT/CMakeLists.txt slicer-3.3.0~svn8934/Libs/IGT/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/IGT/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/IGT/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/IGT/CMakeLists.txt slicer-3.3.0~svn9040/Libs/IGT/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/IGT/CMakeLists.txt 2008-05-21 23:25:36.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/IGT/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -139,9 +139,14 @@
${TRACKING_INTERFACE_LIB}
)
@@ -226,9 +235,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/ITKCommandIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/ITKCommandIO/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/ITKCommandIO/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/ITKCommandIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/ITKCommandIO/CMakeLists.txt slicer-3.3.0~svn9040/Libs/ITKCommandIO/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/ITKCommandIO/CMakeLists.txt 2008-05-28 04:38:39.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/ITKCommandIO/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -71,9 +71,14 @@
ITKIO
)
@@ -245,9 +254,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/LoadableModule/CMakeLists.txt slicer-3.3.0~svn8934/Libs/LoadableModule/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/LoadableModule/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/LoadableModule/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/LoadableModule/CMakeLists.txt slicer-3.3.0~svn9040/Libs/LoadableModule/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/LoadableModule/CMakeLists.txt 2009-02-11 22:48:16.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/LoadableModule/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -116,9 +116,14 @@
target_link_libraries(${lib_name} ${link_libs})
@@ -264,9 +273,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/MGHImageIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/MGHImageIO/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/MGHImageIO/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/MGHImageIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/MGHImageIO/CMakeLists.txt slicer-3.3.0~svn9040/Libs/MGHImageIO/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/MGHImageIO/CMakeLists.txt 2008-05-28 04:38:39.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/MGHImageIO/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -59,9 +59,14 @@
ITKIO
)
@@ -283,9 +292,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/MRML/CMakeLists.txt slicer-3.3.0~svn8934/Libs/MRML/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/MRML/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/MRML/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/MRML/CMakeLists.txt slicer-3.3.0~svn9040/Libs/MRML/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/MRML/CMakeLists.txt 2009-02-27 22:28:47.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/MRML/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -237,9 +237,14 @@
endif(MRML_USE_vtkTeem)
endif(MRML_USE_Teem)
@@ -302,9 +311,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/MRMLIDImageIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/MRMLIDImageIO/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/MRMLIDImageIO/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/MRMLIDImageIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/MRMLIDImageIO/CMakeLists.txt slicer-3.3.0~svn9040/Libs/MRMLIDImageIO/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/MRMLIDImageIO/CMakeLists.txt 2008-05-28 04:38:39.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/MRMLIDImageIO/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -78,9 +78,14 @@
vtkImaging
)
@@ -321,9 +330,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/ModuleDescriptionParser/CMakeLists.txt slicer-3.3.0~svn8934/Libs/ModuleDescriptionParser/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/ModuleDescriptionParser/CMakeLists.txt slicer-3.3.0~svn9040/Libs/ModuleDescriptionParser/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-02-11 22:48:16.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -120,9 +120,14 @@
target_link_libraries(${lib_name} ${link_libs})
@@ -340,9 +349,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/Qdec/CMakeLists.txt slicer-3.3.0~svn8934/Libs/Qdec/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/Qdec/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/Qdec/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/Qdec/CMakeLists.txt slicer-3.3.0~svn9040/Libs/Qdec/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/Qdec/CMakeLists.txt 2008-05-31 17:31:15.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/Qdec/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -76,9 +76,14 @@
# vtkIOTCL
)
@@ -359,9 +368,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/RemoteIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/RemoteIO/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/RemoteIO/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/RemoteIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/RemoteIO/CMakeLists.txt slicer-3.3.0~svn9040/Libs/RemoteIO/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/RemoteIO/CMakeLists.txt 2008-10-10 14:41:24.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/RemoteIO/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -11,8 +11,11 @@
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
@@ -397,9 +406,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.3.0~svn8934/Libs/RemoteIO/vtkHTTPHandler.h
---- slicer-3.3.0~svn8934~/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-25 20:26:49.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.3.0~svn9040/Libs/RemoteIO/vtkHTTPHandler.h
+--- slicer-3.3.0~svn9040~/Libs/RemoteIO/vtkHTTPHandler.h 2008-10-10 14:41:24.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/RemoteIO/vtkHTTPHandler.h 2009-04-04 02:02:42.000000000 +0000
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -409,9 +418,9 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
-diff -urNad slicer-3.3.0~svn8934~/Libs/SlicerIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/SlicerIO/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/SlicerIO/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/SlicerIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/SlicerIO/CMakeLists.txt slicer-3.3.0~svn9040/Libs/SlicerIO/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/SlicerIO/CMakeLists.txt 2008-05-21 23:25:36.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/SlicerIO/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -48,7 +48,7 @@
install(TARGETS ${lib_name}
@@ -421,10 +430,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/vtkITK/CMakeLists.txt slicer-3.3.0~svn8934/Libs/vtkITK/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/vtkITK/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/vtkITK/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
-@@ -110,9 +110,14 @@
+diff -urNad slicer-3.3.0~svn9040~/Libs/vtkITK/CMakeLists.txt slicer-3.3.0~svn9040/Libs/vtkITK/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/vtkITK/CMakeLists.txt 2009-03-25 23:01:37.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/vtkITK/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
+@@ -111,9 +111,14 @@
ITKDICOMParser
)
@@ -440,9 +449,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Libs/vtkTeem/CMakeLists.txt slicer-3.3.0~svn8934/Libs/vtkTeem/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Libs/vtkTeem/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Libs/vtkTeem/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Libs/vtkTeem/CMakeLists.txt slicer-3.3.0~svn9040/Libs/vtkTeem/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Libs/vtkTeem/CMakeLists.txt 2008-11-05 23:39:51.000000000 +0000
++++ slicer-3.3.0~svn9040/Libs/vtkTeem/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -111,9 +111,14 @@
${Teem_LIBRARIES}
)
@@ -459,10 +468,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8934~/Modules/CMakeLists.txt slicer-3.3.0~svn8934/Modules/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
-@@ -56,7 +56,7 @@
+diff -urNad slicer-3.3.0~svn9040~/Modules/CMakeLists.txt slicer-3.3.0~svn9040/Modules/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/CMakeLists.txt 2009-03-27 19:12:39.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
+@@ -57,7 +57,7 @@
Statistics
Tractography
# TumorGrowth
@@ -471,9 +480,9 @@
VolumeRendering
# WFEngineModule <- can't work with 2.6 and Win32??
# MRAblation <- not working either
-diff -urNad slicer-3.3.0~svn8934~/Modules/CommandLineModule/CMakeLists.txt slicer-3.3.0~svn8934/Modules/CommandLineModule/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/CommandLineModule/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/CommandLineModule/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/CommandLineModule/CMakeLists.txt slicer-3.3.0~svn9040/Modules/CommandLineModule/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/CommandLineModule/CMakeLists.txt 2009-02-11 22:48:16.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/CommandLineModule/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -86,6 +86,11 @@
${ITK_LIBRARIES}
)
@@ -486,9 +495,9 @@
# Python settings
if(Slicer3_USE_PYTHON)
-diff -urNad slicer-3.3.0~svn8934~/Modules/EMSegment/CMakeLists.txt slicer-3.3.0~svn8934/Modules/EMSegment/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/EMSegment/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/EMSegment/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/EMSegment/CMakeLists.txt slicer-3.3.0~svn9040/Modules/EMSegment/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/EMSegment/CMakeLists.txt 2008-05-27 22:44:06.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/EMSegment/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -176,6 +176,11 @@
Volumes
)
@@ -501,9 +510,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/Adapter/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/Adapter/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/Meshing/Adapter/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/Meshing/Adapter/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/Meshing/Adapter/CMakeLists.txt slicer-3.3.0~svn9040/Modules/Meshing/Adapter/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/Meshing/Adapter/CMakeLists.txt 2008-12-11 17:55:09.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/Meshing/Adapter/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -58,6 +58,11 @@
ITKAlgorithms
)
@@ -516,9 +525,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/BuildingBlock/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/BuildingBlock/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/Meshing/BuildingBlock/CMakeLists.txt slicer-3.3.0~svn9040/Modules/Meshing/BuildingBlock/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/Meshing/BuildingBlock/CMakeLists.txt 2008-12-11 17:55:09.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -173,6 +173,11 @@
ITKIO
ITKAlgorithms
@@ -531,9 +540,9 @@
#CONFIGURE_FILE(
-diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/Common/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/Common/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/Meshing/Common/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/Meshing/Common/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/Meshing/Common/CMakeLists.txt slicer-3.3.0~svn9040/Modules/Meshing/Common/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/Meshing/Common/CMakeLists.txt 2008-12-24 15:07:19.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/Meshing/Common/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -156,6 +156,12 @@
MRML
)
@@ -547,9 +556,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/Filter/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/Filter/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/Meshing/Filter/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/Meshing/Filter/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/Meshing/Filter/CMakeLists.txt slicer-3.3.0~svn9040/Modules/Meshing/Filter/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/Meshing/Filter/CMakeLists.txt 2008-12-24 15:07:19.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/Meshing/Filter/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -102,6 +102,11 @@
${KWWidgets_LIBRARIES}
)
@@ -562,9 +571,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/IO/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/IO/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/Meshing/IO/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/Meshing/IO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/Meshing/IO/CMakeLists.txt slicer-3.3.0~svn9040/Modules/Meshing/IO/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/Meshing/IO/CMakeLists.txt 2008-12-11 17:55:09.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/Meshing/IO/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -60,6 +60,11 @@
vtkRendering
)
@@ -577,9 +586,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/Widgets/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/Widgets/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/Meshing/Widgets/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/Meshing/Widgets/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/Meshing/Widgets/CMakeLists.txt slicer-3.3.0~svn9040/Modules/Meshing/Widgets/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/Meshing/Widgets/CMakeLists.txt 2008-12-11 17:55:09.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/Meshing/Widgets/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -107,6 +107,11 @@
mimxFilter
mimxCommon
@@ -592,9 +601,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8934~/Modules/OpenIGTLinkIF/CMakeLists.txt slicer-3.3.0~svn8934/Modules/OpenIGTLinkIF/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/OpenIGTLinkIF/CMakeLists.txt slicer-3.3.0~svn9040/Modules/OpenIGTLinkIF/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/OpenIGTLinkIF/CMakeLists.txt 2008-12-09 21:36:04.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -84,6 +84,10 @@
)
slicer3_set_modules_output_path(${lib_name})
@@ -606,22 +615,77 @@
target_link_libraries(${lib_name}
${Slicer3_Libs_LIBRARIES}
-diff -urNad slicer-3.3.0~svn8934~/Modules/ProstateNav/CMakeLists.txt slicer-3.3.0~svn8934/Modules/ProstateNav/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/ProstateNav/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/ProstateNav/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
-@@ -17,6 +17,9 @@
+diff -urNad slicer-3.3.0~svn9040~/Modules/ProstateNav/CMakeLists.txt slicer-3.3.0~svn9040/Modules/ProstateNav/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/ProstateNav/CMakeLists.txt 2009-02-06 03:44:59.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/ProstateNav/CMakeLists.txt 2009-04-04 02:13:02.000000000 +0000
+@@ -17,6 +17,8 @@
# --------------------------------------------------------------------------
# Include dirs
-+find_package(OpenIGTLink REQUIRED)
-+
-+include(${OpenIGTLink_USE_FILE})
++#find_package(OpenIGTLink REQUIRED)
++#include_directories(${OpenIGTLink_INCLUDE_DIRS})
#
-diff -urNad slicer-3.3.0~svn8934~/Modules/QdecModule/CMakeLists.txt slicer-3.3.0~svn8934/Modules/QdecModule/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/QdecModule/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/QdecModule/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/ProstateNav/igtlCoordinateMessage.cxx slicer-3.3.0~svn9040/Modules/ProstateNav/igtlCoordinateMessage.cxx
+--- slicer-3.3.0~svn9040~/Modules/ProstateNav/igtlCoordinateMessage.cxx 2009-02-04 19:15:57.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/ProstateNav/igtlCoordinateMessage.cxx 2009-04-04 02:02:42.000000000 +0000
+@@ -16,8 +16,8 @@
+
+ #include "igtlCoordinateMessage.h"
+
+-#include "igtl_header.h"
+-#include "igtl_position.h"
++#include "igtlutil/igtl_header.h"
++#include "igtlutil/igtl_position.h"
+
+ #include <string.h>
+
+diff -urNad slicer-3.3.0~svn9040~/Modules/ProstateNav/igtlHeaderMessage.cxx slicer-3.3.0~svn9040/Modules/ProstateNav/igtlHeaderMessage.cxx
+--- slicer-3.3.0~svn9040~/Modules/ProstateNav/igtlHeaderMessage.cxx 2009-02-04 19:15:57.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/ProstateNav/igtlHeaderMessage.cxx 2009-04-04 02:04:40.000000000 +0000
+@@ -16,8 +16,8 @@
+
+ #include "igtlHeaderMessage.h"
+
+-#include "igtl_header.h"
+-#include "igtl_position.h"
++#include "igtlutil/igtl_header.h"
++#include "igtlutil/igtl_position.h"
+
+ #include <string.h>
+
+diff -urNad slicer-3.3.0~svn9040~/Modules/ProstateNav/igtlMoveToMessage.cxx slicer-3.3.0~svn9040/Modules/ProstateNav/igtlMoveToMessage.cxx
+--- slicer-3.3.0~svn9040~/Modules/ProstateNav/igtlMoveToMessage.cxx 2009-02-04 19:15:57.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/ProstateNav/igtlMoveToMessage.cxx 2009-04-04 02:03:46.000000000 +0000
+@@ -16,8 +16,8 @@
+
+ #include "igtlMoveToMessage.h"
+
+-#include "igtl_header.h"
+-#include "igtl_position.h"
++#include "igtlutil/igtl_header.h"
++#include "igtlutil/igtl_position.h"
+
+ #include <string.h>
+
+diff -urNad slicer-3.3.0~svn9040~/Modules/ProstateNav/igtlSetZFrameMessage.cxx slicer-3.3.0~svn9040/Modules/ProstateNav/igtlSetZFrameMessage.cxx
+--- slicer-3.3.0~svn9040~/Modules/ProstateNav/igtlSetZFrameMessage.cxx 2009-02-04 19:15:57.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/ProstateNav/igtlSetZFrameMessage.cxx 2009-04-04 02:04:10.000000000 +0000
+@@ -16,8 +16,8 @@
+
+ #include "igtlSetZFrameMessage.h"
+
+-#include "igtl_header.h"
+-#include "igtl_position.h"
++#include "igtlutil/igtl_header.h"
++#include "igtlutil/igtl_position.h"
+
+ #include <string.h>
+
+diff -urNad slicer-3.3.0~svn9040~/Modules/QdecModule/CMakeLists.txt slicer-3.3.0~svn9040/Modules/QdecModule/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/QdecModule/CMakeLists.txt 2008-11-21 05:20:51.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/QdecModule/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -73,6 +73,11 @@
${ITK_LIBRARIES}
)
@@ -634,9 +698,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.3.0~svn8934~/Modules/ScriptedModule/CMakeLists.txt slicer-3.3.0~svn8934/Modules/ScriptedModule/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/ScriptedModule/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/ScriptedModule/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/ScriptedModule/CMakeLists.txt slicer-3.3.0~svn9040/Modules/ScriptedModule/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/ScriptedModule/CMakeLists.txt 2009-02-11 22:48:16.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/ScriptedModule/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -68,6 +68,11 @@
${ITK_LIBRARIES}
)
@@ -649,9 +713,9 @@
# Python settings
if(Slicer3_USE_PYTHON)
-diff -urNad slicer-3.3.0~svn8934~/Modules/SlicerDaemon/CMakeLists.txt slicer-3.3.0~svn8934/Modules/SlicerDaemon/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/SlicerDaemon/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/SlicerDaemon/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/SlicerDaemon/CMakeLists.txt slicer-3.3.0~svn9040/Modules/SlicerDaemon/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/SlicerDaemon/CMakeLists.txt 2008-12-08 09:31:27.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/SlicerDaemon/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -69,6 +69,11 @@
${ITK_LIBRARIES}
)
@@ -664,9 +728,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.3.0~svn8934~/Modules/Tractography/FiducialSeeding/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Tractography/FiducialSeeding/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/Tractography/FiducialSeeding/CMakeLists.txt slicer-3.3.0~svn9040/Modules/Tractography/FiducialSeeding/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2008-07-30 23:34:00.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -75,6 +75,11 @@
${ITK_LIBRARIES}
)
@@ -679,9 +743,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.3.0~svn8934~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt slicer-3.3.0~svn8934/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt slicer-3.3.0~svn9040/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-01-07 19:02:39.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -88,4 +88,9 @@
${ITK_LIBRARIES}
)
@@ -692,9 +756,9 @@
+)
+
slicer3_install_modules(${lib_name})
-diff -urNad slicer-3.3.0~svn8934~/Modules/Volumes/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Volumes/CMakeLists.txt
---- slicer-3.3.0~svn8934~/Modules/Volumes/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
-+++ slicer-3.3.0~svn8934/Modules/Volumes/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+diff -urNad slicer-3.3.0~svn9040~/Modules/Volumes/CMakeLists.txt slicer-3.3.0~svn9040/Modules/Volumes/CMakeLists.txt
+--- slicer-3.3.0~svn9040~/Modules/Volumes/CMakeLists.txt 2009-01-20 22:30:16.000000000 +0000
++++ slicer-3.3.0~svn9040/Modules/Volumes/CMakeLists.txt 2009-04-04 02:02:42.000000000 +0000
@@ -98,6 +98,11 @@
SlicerTractographyFiducialSeeding
)
Modified: packages/slicer/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/rules?rev=35626&op=diff
==============================================================================
--- packages/slicer/trunk/debian/rules (original)
+++ packages/slicer/trunk/debian/rules Sun Apr 5 21:40:47 2009
@@ -10,9 +10,25 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=0
+# set the number of build jobs
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
+# set optimization mode
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+# set shared build path
SHARED_BUILD_PATH = DEB_build_shared
+
CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_CXX_FLAGS="-Wno-deprecated" \
+ -DCMAKE_CXX_FLAGS=$(CFLAGS) \
+ -DCMAKE_BUILD_TYPE="Debug" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
-DVOLUMERENDERINGMODULE:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=ON \
@@ -22,21 +38,6 @@
-DSlicer3_USE_IGSTK:BOOL=OFF \
-DSlicer3_USE_OPENIGTLINK:BOOL=ON \
-DSlicer3_USE_MIDAS:BOOL=ON \
-# -DTEEM_DIR:PATH=/usr/lib/Teem-1.10.0 \
-
-
-CFLAGS = -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-export CFLAGS
-
-# set the number of build jobs
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
get-orig-source:
@@ -55,7 +56,7 @@
cd $(SHARED_BUILD_PATH) \
&& cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON
- touch configure-stamp
+ touch $@
build: build-stamp
@@ -66,7 +67,7 @@
# Add here commands to compile the package.
# export LD_LIBRARY_PATH=$(SHARED_BUILD_PATH)/bin/:$LD_LIBRARY_PATH
# ldconfig
- LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}:$(SHARED_BUILD_PATH)/bin/
+# LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}:$(SHARED_BUILD_PATH)/bin/
# build shared libs and binaries
cd $(SHARED_BUILD_PATH) && $(MAKE) $(JOBS)
@@ -148,7 +149,7 @@
# dh_perl
# dh_makeshlibs
dh_installdeb
- dh_shlibdeps -l $(CURDIR)/debian/tmp/usr/lib/:$(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules/
+ dh_shlibdeps -l $(CURDIR)/debian/tmp/usr/lib:$(CURDIR)/debian/tmp/usr/lib/Slicer3:$(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules
dh_gencontrol
dh_md5sums
dh_builddeb
More information about the debian-science-commits
mailing list