r35858 - in /packages/slicer/trunk/debian: README.source changelog control get-orig-source patches/00list patches/50_all_changes.diff patches/50_all_changes.dpatch patches/series rules

domibel-guest at users.alioth.debian.org domibel-guest at users.alioth.debian.org
Wed Sep 16 19:28:01 UTC 2009


Author: domibel-guest
Date: Wed Sep 16 19:28:00 2009
New Revision: 35858

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35858
Log:
patch system changed to quilt

Added:
    packages/slicer/trunk/debian/patches/50_all_changes.diff
    packages/slicer/trunk/debian/patches/series
Removed:
    packages/slicer/trunk/debian/patches/00list
    packages/slicer/trunk/debian/patches/50_all_changes.dpatch
Modified:
    packages/slicer/trunk/debian/README.source
    packages/slicer/trunk/debian/changelog
    packages/slicer/trunk/debian/control
    packages/slicer/trunk/debian/get-orig-source
    packages/slicer/trunk/debian/rules

Modified: packages/slicer/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/README.source?rev=35858&op=diff
==============================================================================
--- packages/slicer/trunk/debian/README.source (original)
+++ packages/slicer/trunk/debian/README.source Wed Sep 16 19:28:00 2009
@@ -1,1 +1,16 @@
-adding soname ...
+1)
+I removed some precompiled files which are used to launch Slicer in non-standard environments.
+
+Please read 
+   debian/get-orig-source
+for more information.
+
+2)
+I am using quilt to add SONAME information to the libraries.
+
+Please read 
+   /usr/share/doc/quilt/README.source
+for more information.
+
+
+-Dominique

Modified: packages/slicer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/changelog?rev=35858&op=diff
==============================================================================
--- packages/slicer/trunk/debian/changelog (original)
+++ packages/slicer/trunk/debian/changelog Wed Sep 16 19:28:00 2009
@@ -1,6 +1,7 @@
-slicer (3.4.0~svn10438-1) experimental; urgency=low
+slicer (3.4.0~svn10438-1) unstable; urgency=low
 
   * switch to Tcl/Tk 8.5
+  * change patch system to quilt
   * move some runtime files to libslicer3 (Closes: #541890)
   * Bump standard version to 3.8.3
 

Modified: packages/slicer/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/control?rev=35858&op=diff
==============================================================================
--- packages/slicer/trunk/debian/control (original)
+++ packages/slicer/trunk/debian/control Wed Sep 16 19:28:00 2009
@@ -3,7 +3,7 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
-Build-Depends: debhelper (>= 7), dpatch, cmake, tcl8.5-dev, tk8.5-dev, libpng-dev, libjpeg-dev,
+Build-Depends: debhelper (>= 7), quilt, cmake, tcl8.5-dev, tk8.5-dev, libpng-dev, libjpeg-dev,
  libtiff-dev, libexpat1-dev, libinsighttoolkit3-dev, libkwwidgets1-dev, libcurl4-openssl-dev,
  libfreetype6-dev, libxext-dev, libvtk5-dev, libteem1-dev, libopenigtlink1-dev,
  uuid-dev, libbz2-dev, libxft-dev, libtclap-dev, libgdcm2-dev, libfftw3-dev, libopenjpeg-dev

Modified: packages/slicer/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/get-orig-source?rev=35858&op=diff
==============================================================================
--- packages/slicer/trunk/debian/get-orig-source (original)
+++ packages/slicer/trunk/debian/get-orig-source Wed Sep 16 19:28:00 2009
@@ -11,48 +11,28 @@
 fi
 
 REVISION=`echo $VERSION | sed -e 's/^.*svn//g'`
-
+#REVISION=10438
+FOLDER=${PACKAGE}-${VERSION}
 
 if [ -z ${TARFILE}]; then
 TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
 fi
 
-FOLDER=${PACKAGE}-${VERSION}
-
-#svn checkout --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-4 ${FOLDER}
 
 cd ${FOLDER}
-#rm ./Utilities/Launcher/*.tcl
-#rm ./Utilities/Launcher/CMakeLists.txt
 rm -rf ./Utilities/Launcher/Slicer3Launchers/ 
 rm -rf ./Utilities/Launcher/tclkits/
 rm -rf ./Utilities/Launcher/Slicer3.vfs/
 rm -f ./Utilities/Launcher/3DSlicerLogoICOimages/Thumbs.db
 rm -rf ./Libs/tclap/
-#- find . -type f -name *.vcproj | xargs rm
 rm -f ./Modules/QueryAtlas/Resources/controlledVocabulary.xls
-#rm -f ./Modules/ChangeTracker/Testing/scan2.raw.gz
-#rm -f ./Modules/ChangeTracker/Simulation/original.raw.gz
-#rm -f ./Modules/ChangeTracker/Testing/scan1.raw.gz
 # remove jar files
 rm -rf ./Modules/QueryAtlas/OntologyViz/
-#rm -rf ./Testing/
-#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/StandardData/StandardSegmentationResult_small_normalizationOn.raw
-#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/StandardData/StandardSegmentationResult_small.raw
-#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/atlasBackgroundReg_small.raw
-#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/atlasCSFReg_small.raw
-#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/atlasGreymatterReg_small.raw
-#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/atlasWhitematterReg_small.raw
-#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/segmentationResult_small.raw
-#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/targetT1Normed_small.raw
-#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/targetT2Normed_small.raw
 rm ./Modules/Editor/ImageData/Thumbs.db
 rm ./Modules/MRAblation/.vtkMRAblationLogic.cxx.swo
 rm -rf ./Modules/ProstateNav/newmat
-#grep -rnl Davies ./Modules/ProstateNav/newmat/ | xargs rm
 cd ..
 
 GZIP=-9 tar czf ${TARFILE} ${FOLDER}
 rm -rf ${FOLDER}
-

Added: packages/slicer/trunk/debian/patches/50_all_changes.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/50_all_changes.diff?rev=35858&op=file
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.diff (added)
+++ packages/slicer/trunk/debian/patches/50_all_changes.diff Wed Sep 16 19:28:00 2009
@@ -1,0 +1,1458 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_all_changes.dpatch by  <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch adds soname version numbers
+
+Index: slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Applications/CLI/CMakeLists.txt	2009-09-16 09:30:32.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -269,34 +269,6 @@
+ target_link_libraries (${CLP}Lib ITKIO ITKBasicFilters)
+ 
+ #####################
+-set (CLP DicomToNrrdConverter)
+-
+-set ( ${CLP}_SOURCE ${CLP}.cxx)
+-generateclp(${CLP}_SOURCE ${CLP}.xml ${Slicer3_SOURCE_DIR}/Resources/NAMICLogo.h)
+-add_executable(${CLP} ${${CLP}_SOURCE})
+-slicer3_set_plugins_output_path(${CLP})
+-target_link_libraries (${CLP} ITKIO ITKBasicFilters)
+-
+-add_library(${CLP}Lib SHARED ${${CLP}_SOURCE})
+-slicer3_set_plugins_output_path(${CLP}Lib)
+-set_target_properties (${CLP}Lib PROPERTIES COMPILE_FLAGS "-Dmain=ModuleEntryPoint")
+-target_link_libraries (${CLP}Lib ITKIO ITKBasicFilters)
+-
+-#####################
+-set (CLP DWIDicomLoad)
+-
+-set ( ${CLP}_SOURCE ${CLP}.cxx)
+-generateclp(${CLP}_SOURCE ${CLP}.xml ${Slicer3_SOURCE_DIR}/Resources/NAMICLogo.h)
+-add_executable(${CLP} ${${CLP}_SOURCE})
+-slicer3_set_plugins_output_path(${CLP})
+-target_link_libraries (${CLP} ITKIO ITKBasicFilters)
+-
+-add_library(${CLP}Lib SHARED ${${CLP}_SOURCE})
+-slicer3_set_plugins_output_path(${CLP}Lib)
+-set_target_properties (${CLP}Lib PROPERTIES COMPILE_FLAGS "-Dmain=ModuleEntryPoint")
+-target_link_libraries (${CLP}Lib ITKIO ITKBasicFilters)
+-
+-#####################
+ set (CLP HistogramMatching)
+ 
+ set ( ${CLP}_SOURCE ${CLP}.cxx)
+@@ -569,11 +541,11 @@
+ 
+ else ( ${ITK_VERSION_MAJOR} GREATER 3 )
+ 
+-  if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
++  if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 14 )
+ 
+     subdirs( RegisterImagesModule )
+ 
+-  else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
++  else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 14 )
+ 
+     if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
+       if ( ITK_USE_OPTIMIZED_REGISTRATION_METHODS )
+@@ -585,7 +557,7 @@
+       message ("RegisterImagesModule requires ITK version 3.8 or higher")
+     endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
+ 
+-  endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
++  endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 14 )
+ 
+ endif ( ${ITK_VERSION_MAJOR} GREATER 3 )
+ 
+@@ -661,10 +633,6 @@
+     CheckerBoardLib
+     GaussianBlurImageFilter
+     GaussianBlurImageFilterLib
+-    DicomToNrrdConverter
+-    DicomToNrrdConverterLib
+-    DWIDicomLoad
+-    DWIDicomLoadLib
+     FreesurferSurfaceSectionExtraction
+     ZeroCrossingBasedEdgeDetectionImageFilter
+     ZeroCrossingBasedEdgeDetectionImageFilterLib
+Index: slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt	2009-09-16 09:30:32.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -18,8 +18,8 @@
+ 
+ #
+ # Find SLICERLIBCURL (slicercurl)
+-find_package(SLICERLIBCURL REQUIRED)
+-include(${SLICERLIBCURL_USE_FILE})
++find_package(CURL REQUIRED)
++include(${CURL_INCLUDE_DIRS})
+ 
+ #
+ # Find GenerateCLP
+@@ -39,7 +39,7 @@
+ add_executable(DownloadSlicerTutorials ${DownloadSlicerTutorials_SOURCE})
+ slicer3_set_plugins_output_path(DownloadSlicerTutorials)
+ target_link_libraries(DownloadSlicerTutorials 
+-  ${SLICERLIBCURL_LIBRARIES} ITKIO MRMLIDIO itkzlib)
++  ${CURL_LIBRARIES} ITKIO MRMLIDIO)
+ 
+ #
+ # Generate shared loadable slicer module
+@@ -49,7 +49,7 @@
+   COMPILE_FLAGS "-Dmain=ModuleEntryPoint")
+ slicer3_set_plugins_output_path(DownloadSlicerTutorialsModule)
+ target_link_libraries(DownloadSlicerTutorialsModule 
+-  ${SLICERLIBCURL_LIBRARIES} ITKIO MRMLIDIO itkzlib)
++  ${CURL_LIBRARIES} ITKIO MRMLIDIO)
+ 
+ #
+ # Move exec and module to where Slicer can find them
+Index: slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx	2009-09-16 09:30:32.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx	2009-09-16 09:32:20.000000000 -0400
+@@ -3,7 +3,7 @@
+ #endif
+ 
+ // Includes
+-#include <slicerlibcurl/slicerlibcurl.h>
++#include <curl/curl.h>
+ #include <itksys/SystemTools.hxx>
+ #include <itksys/Process.h>
+ #include <math.h>
+Index: slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Applications/GUI/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -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}\"")
+     set(Slicer3_FORWARD_PATH_INSTALL
+-      "\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\",\"../lib/Teem-${Teem_VERSION_MAJOR}.${Teem_VERSION_MINOR}\",\"../lib/TclTk/lib\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\",\"../lib/FreeSurfer\",\"../lib/IGT\",\"../lib/ITKCommandIO\",\"../lib/LoadableModule\",\"../lib/MGHImageIO\",\"../lib/MRML\",\"../lib/ModuleDescriptionParser\",\"../lib/MRMLIDImageIO\",\"../lib/Qdec\",\"../lib/RemoteIO\",\"../lib/SlicerIO\",\"../lib/tclap\",\"../lib/vtkITK\",\"../lib/vtkTeem\"")
++      "\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\"")
+     if(Slicer3_BUILD_MODULES)
+       set(Slicer3_FORWARD_PATH_BUILD 
+         "${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\"")
+@@ -95,8 +95,10 @@
+ # --------------------------------------------------------------------------
+ # Find SLICERLIBCURL (slicercurl)
+ #
+-find_package(SLICERLIBCURL REQUIRED)
+-include(${SLICERLIBCURL_USE_FILE})
++#find_package(SLICERLIBCURL REQUIRED)
++#include(${SLICERLIBCURL_USE_FILE})
++find_package(CURL REQUIRED)
++include(${CURL_INCLUDE_DIRS})
+ 
+ # --------------------------------------------------------------------------
+ # Include dirs
+Index: slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Applications/GUI/Slicer3.cxx	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx	2009-09-16 09:32:20.000000000 -0400
+@@ -411,7 +411,7 @@
+     }
+ 
+   std::string tclEnv = "TCL_LIBRARY=";
+-  tclEnv += slicerHome + "/lib/TclTk/lib/tcl" + Slicer3_TCL_TK_MAJOR_VERSION + "." + Slicer3_TCL_TK_MINOR_VERSION;
++  tclEnv += slicerHome + "/lib/tcl" + Slicer3_TCL_TK_MAJOR_VERSION + "." + Slicer3_TCL_TK_MINOR_VERSION;
+   vtkKWApplication::PutEnv(const_cast <char *> (tclEnv.c_str()));
+ 
+   // ITK factories dir
+Index: slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Base/CLI/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -58,6 +58,11 @@
+ slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
+ slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} SlicerBaseCLI)
+ 
++SET_TARGET_PROPERTIES(SlicerBaseCLI PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ install(TARGETS SlicerBaseCLI
+   RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries 
+   LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Base/GUI/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -177,6 +177,11 @@
+   RemoteIO
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
+ slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
+ 
+Index: slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Base/Logic/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -115,6 +115,11 @@
+ slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
+ slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ install(TARGETS ${lib_name}
+   RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries 
+   LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.4.0~svn10438/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/CMakeLists.txt	2009-09-16 09:30:32.000000000 -0400
++++ slicer-3.4.0~svn10438/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -27,6 +27,11 @@
+ 
+ set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
+ 
++# TCL
++find_package(TCL REQUIRED)
++
++
++
+ #-----------------------------------------------------------------------------
+ # Disable the warnings that DevStudio 2005 emits wrt to sprintf, strcpu, etc.
+ #
+@@ -60,6 +65,9 @@
+ set(Slicer3_VERSION "${Slicer3_VERSION_MAJOR}.${Slicer3_VERSION_MINOR}")
+ set(Slicer3_VERSION_FULL "${Slicer3_VERSION}.${Slicer3_VERSION_PATCH}")
+ 
++set ( Slicer3_SHAREDLIB_VERSION ${Slicer3_VERSION_FULL} )
++string ( REGEX MATCH "^[0-9]+" Slicer3_SHAREDLIB_SOVERSION ${Slicer3_SHAREDLIB_VERSION} )
++
+ #-----------------------------------------------------------------------------
+ # Build shared lib by default
+ #
+@@ -159,10 +167,15 @@
+ include(${Teem_USE_FILE})
+ 
+ ## SlicerLibCurl
+-find_package(SLICERLIBCURL REQUIRED)
+-if(SLICERLIBCURL_FOUND)
+-  include(${SLICERLIBCURL_USE_FILE})
+-endif(SLICERLIBCURL_FOUND)
++#find_package(SLICERLIBCURL REQUIRED)
++#if(SLICERLIBCURL_FOUND)
++#  include(${SLICERLIBCURL_USE_FILE})
++#endif(SLICERLIBCURL_FOUND)
++find_package(CURL REQUIRED)
++if(CURL_FOUND)
++  # Add include directories needed to use CURL.
++  include_directories(${CURL_INCLUDE_DIRS})
++endif(CURL_FOUND)
+  
+ ## BatchMake
+ option(Slicer3_USE_BatchMake "Build Slicer3 with BatchMake support." OFF)
+@@ -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)
+ 
+ #-----------------------------------------------------------------------------
+@@ -382,6 +395,7 @@
+   ${Slicer3_SOURCE_DIR}/CTestConfig.cmake
+   ${Slicer3_BINARY_DIR}/UseSlicer3.cmake
+   ${Slicer3_BINARY_DIR}/Utilities/Slicer3Config.cmake
++  ${Slicer3_BINARY_DIR}/lib/Slicer3/Slicer3Version.txt
+   DESTINATION ${Slicer3_INSTALL_LIB_DIR}
+   COMPONENT Development
+   )
+Index: slicer-3.4.0~svn10438/Libs/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -1,7 +1,6 @@
+ project(SlicerLibs)
+ 
+ set(dirs
+-  tclap
+   ModuleDescriptionParser
+   GenerateCLP
+   LoadableModule
+Index: slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/FreeSurfer/CMakeLists.txt	2009-09-16 09:30:34.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -68,9 +68,14 @@
+   vtkIOTCL
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/GenerateCLP/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -11,10 +11,10 @@
+   include(${ModuleDescriptionParser_USE_FILE})
+ endif(ModuleDescriptionParser_FOUND)
+ 
+-find_package(TCLAP REQUIRED)
+-if(TCLAP_FOUND)
+-  include(${TCLAP_USE_FILE})
+-endif(TCLAP_FOUND)
++#find_package(TCLAP REQUIRED)
++#if(TCLAP_FOUND)
++#  include(${TCLAP_USE_FILE})
++#endif(TCLAP_FOUND)
+ 
+ find_package(ITK REQUIRED)
+ if(ITK_FOUND)
+Index: slicer-3.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/GenerateCLP/UseGenerateCLP.cmake.in	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in	2009-09-16 09:32:20.000000000 -0400
+@@ -5,10 +5,10 @@
+   message(FATAL_ERROR "Cannot build without ITK. Please set ITK_DIR.")
+ endif(ITK_FOUND)
+ 
+-find_package(TCLAP REQUIRED)
+-if(TCLAP_FOUND)
+-  include(${TCLAP_USE_FILE})
+-endif(TCLAP_FOUND)
++#find_package(TCLAP REQUIRED)
++#if(TCLAP_FOUND)
++#  include(${TCLAP_USE_FILE})
++#endif(TCLAP_FOUND)
+ 
+ find_package(ModuleDescriptionParser REQUIRED)
+ if(ModuleDescriptionParser_FOUND)
+Index: slicer-3.4.0~svn10438/Libs/IGT/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/IGT/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/IGT/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -139,9 +139,14 @@
+   ${TRACKING_INTERFACE_LIB}
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/ITKCommandIO/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -71,9 +71,14 @@
+   ITKIO
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/LoadableModule/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -116,9 +116,14 @@
+ 
+ target_link_libraries(${lib_name} ${link_libs})
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/MGHImageIO/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -59,9 +59,14 @@
+   ITKIO 
+ )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/MRML/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/MRML/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/MRML/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -237,9 +237,14 @@
+   endif(MRML_USE_vtkTeem)
+ endif(MRML_USE_Teem)
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/MRMLIDImageIO/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -78,9 +78,14 @@
+   vtkImaging
+ )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/ModuleDescriptionParser/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -120,9 +120,14 @@
+ 
+ target_link_libraries(${lib_name} ${link_libs})
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/Qdec/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/Qdec/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/Qdec/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -76,9 +76,14 @@
+   #  vtkIOTCL
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/Qdec/QdecContrast.cpp
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/Qdec/QdecContrast.cpp	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/Qdec/QdecContrast.cpp	2009-09-16 09:32:20.000000000 -0400
+@@ -16,6 +16,7 @@
+ #include <errno.h>
+ #include <sys/stat.h>
+ #include <cassert>
++#include <cstdio>
+ 
+ #include "QdecContrast.h"
+ 
+Index: slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/RemoteIO/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -11,8 +11,11 @@
+ find_package(ITK REQUIRED)
+ include(${ITK_USE_FILE})
+ 
+-find_package(SLICERLIBCURL REQUIRED)
+-include(${SLICERLIBCURL_USE_FILE})
++find_package(CURL REQUIRED)
++if(CURL_FOUND)
++  # Add include directories needed to use CURL.
++  include_directories(${CURL_INCLUDE_DIRS})
++endif(CURL_FOUND)
+ 
+ # Disable MSVC 8 warnings
+ if(WIN32)
+@@ -100,13 +103,18 @@
+   vtkIOTCL
+   vtkCommonTCL
+   itksys
+-  ${SLICERLIBCURL_LIBRARIES}
++  ${CURL_LIBRARIES}
+   MRML
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/RemoteIO/vtkHTTPHandler.h	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h	2009-09-16 09:32:20.000000000 -0400
+@@ -5,7 +5,7 @@
+ #pragma warning ( disable : 4786 )
+ #endif
+ 
+-#include <slicerlibcurl/slicerlibcurl.h>
++#include <curl/curl.h>
+ 
+ #include <vtkRemoteIOConfigure.h>
+ #include "vtkRemoteIO.h"
+Index: slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/SlicerIO/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -48,7 +48,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.4.0~svn10438/Libs/vtkITK/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/vtkITK/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/vtkITK/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -111,9 +111,14 @@
+   ITKDICOMParser
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h	2009-09-16 09:32:20.000000000 -0400
+@@ -34,7 +34,7 @@
+ #include <string>
+ 
+ #include "itkMetaDataDictionary.h"
+-#include "gdcmDictSet.h"        // access to dictionary
++//#include "gdcmDictSet.h"        // access to dictionary
+ #include "gdcmDict.h"           // access to dictionary
+ #include "gdcmDictEntry.h"      // access to dictionary
+ #include "gdcmGlobal.h"         // access to dictionary
+Index: slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Libs/vtkTeem/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -111,9 +111,14 @@
+   ${Teem_LIBRARIES}
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ 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.4.0~svn10438/Modules/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -74,7 +74,7 @@
+   subdirs(
+     OpenIGTLinkIF
+     NeuroNav
+-    ProstateNav
++#    ProstateNav
+     )
+ endif(Slicer3_USE_OPENIGTLINK)
+ 
+Index: slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/ChangeTracker/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -40,8 +40,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkChangeTrackerConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -114,6 +112,11 @@
+   )
+ slicer3_set_modules_output_path(${lib_name})
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ target_link_libraries(${lib_name}
+   ${Slicer3_Libs_LIBRARIES}
+   ${Slicer3_Base_LIBRARIES}
+Index: slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/CommandLineModule/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,8 +31,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkCommandLineModuleConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -86,6 +84,11 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ # Python settings
+ 
+ if(Slicer3_USE_PYTHON)
+Index: slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/EMSegment/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -44,8 +44,6 @@
+   "${CMAKE_CURRENT_SOURCE_DIR}/Registration/*.h"
+   )
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkEMSegmentConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -176,6 +174,11 @@
+   Volumes
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/FetchMI/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -33,8 +33,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkFetchMIConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -91,6 +89,11 @@
+   Volumes
+   )
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,8 +31,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkGradientAnisotropicDiffusionFilterConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -92,6 +90,11 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Adapter/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -58,6 +58,11 @@
+   ITKAlgorithms
+   )
+ 
++set_target_properties(${LIB_NAME} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ install(TARGETS ${LIB_NAME}
+   RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries 
+   LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/BuildingBlock/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -173,6 +173,11 @@
+   ITKIO
+   ITKAlgorithms
+   )
++
++SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
+  
+ 
+ #CONFIGURE_FILE(
+Index: slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Common/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -156,6 +156,12 @@
+   MRML
+   )
+ 
++SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
++
+ install(TARGETS ${LIB_NAME}
+   RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries 
+   LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Filter/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -102,6 +102,11 @@
+   ${KWWidgets_LIBRARIES}
+   )
+ 
++SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ install(TARGETS ${LIB_NAME}
+   RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries 
+   LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -44,8 +44,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkIA_FEMeshConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+   
+@@ -102,4 +100,9 @@
+   BuildingBlock
+   )
+ 
++set_target_properties(${LIB_NAME} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${LIB_NAME})
+Index: slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/IO/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -60,6 +60,11 @@
+   vtkRendering
+   )
+ 
++SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ install(TARGETS ${LIB_NAME}
+   RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries 
+   LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Meshing/Widgets/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -107,6 +107,11 @@
+   mimxFilter
+   mimxCommon
+   )
++
++SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
+   
+ install(TARGETS ${LIB_NAME}
+   RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries 
+Index: slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/NeuroNav/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -40,8 +40,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
+   )
+ 
+@@ -84,6 +82,11 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ 
+Index: slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/OpenIGTLinkIF/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -40,8 +40,6 @@
+   )
+ 
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkOpenIGTLinkIFConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -84,6 +82,10 @@
+   )
+ slicer3_set_modules_output_path(${lib_name})
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
+ 
+ target_link_libraries(${lib_name}
+   ${Slicer3_Libs_LIBRARIES}
+Index: slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/ProstateNav/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -17,12 +17,16 @@
+ 
+ # --------------------------------------------------------------------------
+ # Include dirs
++#find_package(OpenIGTLink REQUIRED)
++#include_directories(${OpenIGTLink_INCLUDE_DIRS})
+ 
+ 
+ #
+ # Include dirs
+ #
+ 
++include_directories( /usr/include/newmat )
++
+ 
+ include_directories(
+   ${CMAKE_CURRENT_SOURCE_DIR}
+@@ -82,32 +86,9 @@
+   ${CMAKE_CURRENT_SOURCE_DIR}/igtlHeaderMessage.cxx
+   ${CMAKE_CURRENT_SOURCE_DIR}/igtlMoveToMessage.cxx
+   ${CMAKE_CURRENT_SOURCE_DIR}/igtlSetZFrameMessage.cxx
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat9.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmatrm.cpp
+   ${CMAKE_CURRENT_SOURCE_DIR}/newmat/nm_misc.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/bandmat.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat1.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/solution.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/cholesky.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/hholder.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat2.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmatex.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat3.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/sort.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/evalue.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/jacobi.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat4.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/submat.cpp
+   ${CMAKE_CURRENT_SOURCE_DIR}/newmat/example.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat5.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/svd.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/myexcept.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat6.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmatnl.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/fft.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat7.cpp
+   ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newfft.cpp
+-  ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat8.cpp
+   ${CMAKE_CURRENT_SOURCE_DIR}/newmat/ZLinAlg.cxx
+ )
+ 
+Index: slicer-3.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h	2009-09-16 09:32:20.000000000 -0400
+@@ -37,6 +37,13 @@
+ class VTK_PROSTATENAV_EXPORT vtkProstateNavCalibrationStep : public vtkProstateNavStep
+ {
+ public:
++  //BTX
++  typedef NEWMAT::Matrix Matrix;
++  typedef NEWMAT::Real Real;
++  typedef NEWMAT::FFT2 FFT2;
++  typedef NEWMAT::FFT2I FFT2I;
++  //ETX
++
+   static vtkProstateNavCalibrationStep *New();
+   vtkTypeRevisionMacro(vtkProstateNavCalibrationStep,vtkProstateNavStep);
+   void PrintSelf(ostream& os, vtkIndent indent);
+Index: slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/QdecModule/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,8 +31,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
+   )
+ 
+@@ -73,6 +71,11 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/QueryAtlas/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -42,14 +42,11 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkQueryAtlasConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/Resources/*.h")
+ install(FILES 
+-  ${headers} 
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
+   ) 
+ 
+@@ -111,6 +108,11 @@
+   QdecModule
+   )
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+@@ -204,14 +206,14 @@
+   OntologyViz/extjars/prefuse.jar    
+   )
+ 
+-foreach(file ${ONTOVIZFILES})
+-  configure_file(
+-    ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+-    ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${file}
+-    COPYONLY)
+-  get_filename_component(path "${file}" PATH)
+-  install(FILES 
+-    ${file} 
+-    DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${path} COMPONENT Development
+-    ) 
+-endforeach(file)
++#foreach(file ${ONTOVIZFILES})
++#  configure_file(
++#    ${CMAKE_CURRENT_SOURCE_DIR}/${file}
++#    ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${file}
++#    COPYONLY)
++#  get_filename_component(path "${file}" PATH)
++#  install(FILES 
++#    ${file} 
++#    DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${path} COMPONENT Development
++#    ) 
++#endforeach(file)
+Index: slicer-3.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/RealTimeImaging/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -32,7 +32,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+   "${CMAKE_CURRENT_BINARY_DIR}/vtkRealTimeImagingConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+Index: slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/ScriptedModule/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,8 +31,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkScriptedModuleConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -68,6 +66,11 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ # Python settings
+ 
+ if(Slicer3_USE_PYTHON)
+Index: slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/SlicerDaemon/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,8 +31,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerDaemonConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -69,6 +67,11 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/SlicerWelcome/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -37,8 +37,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerWelcomeConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -79,5 +77,10 @@
+   ${KWWidgets_LIBRARIES}
+   )
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+Index: slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,8 +31,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkLabelStatisticsConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -73,6 +71,11 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Tractography/Display/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,14 +31,11 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerTractographyDisplayConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/Resources/*.h")
+ install(FILES 
+-  ${headers} 
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
+   )
+ 
+@@ -85,4 +82,9 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+Index: slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,8 +31,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerTractographyFiducialSeedingConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -75,6 +73,11 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Tractography/Seeding/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,8 +31,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerTractographySeedingConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -68,6 +66,11 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/VolumeRendering/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -33,8 +33,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkVolumeRenderingConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -95,6 +93,11 @@
+   VolumeRenderingReplacements
+   )
+ 
++set_target_properties(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -31,8 +31,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+-  "${CMAKE_CURRENT_BINARY_DIR}/vtkVolumeRenderingReplacementsConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+ 
+@@ -88,4 +86,9 @@
+   ${ITK_LIBRARIES}
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+Index: slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Modules/Volumes/CMakeLists.txt	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -37,7 +37,6 @@
+ 
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES 
+-  ${headers} 
+   "${CMAKE_CURRENT_BINARY_DIR}/vtkVolumesConfigure.h"
+   DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+   )
+@@ -98,6 +97,11 @@
+   SlicerTractographyFiducialSeeding
+   )
+ 
++SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++  SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++  VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+ 
+ # --------------------------------------------------------------------------
+Index: slicer-3.4.0~svn10438/Scripts/versioner.tcl
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Scripts/versioner.tcl	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/Scripts/versioner.tcl	2009-09-16 09:32:20.000000000 -0400
+@@ -16,13 +16,6 @@
+ 
+ ################################################################################
+ 
+-# for subversion repositories (Sandbox)
+-if {[info exists ::env(SVN)]} {
+-    set ::SVN $::env(SVN)
+-} else {
+-    set ::SVN svn
+-}
+-
+ 
+ ################################################################################
+ # build the lib/Slicer3/Slicer3version.txt file
+@@ -36,28 +29,16 @@
+ cd [file dirname [info script]]
+ cd ..
+ set ::Slicer3_HOME [pwd]
+-
+-source $::Slicer3_HOME/slicer_variables.tcl
++set ::Slicer3_BUILD $::Slicer3_HOME/DEB_build_shared
+ 
+ set ::Slicer3_BUILDDATE [clock format [clock seconds] -format %Y-%m-%d]
+ 
+-set svninfo [split [exec svn info] "\n"]
+-array set svn ""
+-foreach line $svninfo {
+-  foreach {tag value} $line {
+-    if { $tag == "URL:" } {
+-      set svn(URL) $value
+-    }
+-    if { $tag == "Revision:" } {
+-      set svn(revision) $value
+-    }
+-  }
+-}
+ cd $cwd
+ 
+ set fp [open $::Slicer3_BUILD/lib/Slicer3/Slicer3Version.txt "w"]
+-puts $fp "build $::env(BUILD)"
++puts $fp "os $::tcl_platform(os)"
++puts $fp "machine $::tcl_platform(machine)"
+ puts $fp "buildDate $::Slicer3_BUILDDATE"
+-puts $fp "svnurl $svn(URL)"
+-puts $fp "svnrevision $svn(revision)"
++puts $fp "svnurl http://svn.slicer.org/Slicer3/branches/Slicer-3-4"
++puts $fp "svnrevision 10317"
+ close $fp
+Index: slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt
+===================================================================
+--- slicer-3.4.0~svn10438.orig/Utilities/Launcher/CMakeLists.txt	2009-09-16 09:30:32.000000000 -0400
++++ slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt	2009-09-16 09:32:20.000000000 -0400
+@@ -40,11 +40,11 @@
+ set(launcher_source
+   "${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Launchers/${launcher_name}")
+ set(launcher_binary
+-  "${Slicer3_BINARY_DIR}/Slicer3${CMAKE_EXECUTABLE_SUFFIX}")
++  "${Slicer3_BINARY_DIR}/Slicer3-launcher${CMAKE_EXECUTABLE_SUFFIX}")
+ 
+ if(EXISTS "${launcher_source}")
+   configure_file("${launcher_source}" "${launcher_binary}" COPYONLY)
+-  install(PROGRAMS "${launcher_binary}" DESTINATION ".")
++  install(PROGRAMS "${launcher_binary}" DESTINATION ${Slicer3_INSTALL_BIN_DIR})
+ endif(EXISTS "${launcher_source}")
+ 
+ # Should this location change, change Application/GUI/Slicer3.cxx as well
+Index: slicer-3.4.0~svn10438/launch.tcl.in
+===================================================================
+--- slicer-3.4.0~svn10438.orig/launch.tcl.in	2009-09-16 09:30:33.000000000 -0400
++++ slicer-3.4.0~svn10438/launch.tcl.in	2009-09-16 09:32:20.000000000 -0400
+@@ -100,7 +100,7 @@
+ 
+ 
+   # if installed, everything is in the local tree
+-  set ::Slicer3_REAL $::Slicer3_HOME/bin/Slicer3-real$ext
++  set ::Slicer3_REAL $::Slicer3_HOME/lib/Slicer3/Slicer3-real
+ 
+   set ::env(SANDBOX_BIN_DIR)   ""
+ 
+@@ -827,11 +827,11 @@
+ 
+ launch_SetPaths 
+ 
+-set ret [catch launch_ImportModulePaths res]
+-if { $ret } {
+-  puts "Could not query slicer for module paths"
+-  puts $res
+-}
++#set ret [catch launch_ImportModulePaths res]
++#if { $ret } {
++#  puts "Could not query slicer for module paths"
++#  puts $res
++#}
+ 
+ #
+ # run program until it exits and then exit this script with the ouput

Added: packages/slicer/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/series?rev=35858&op=file
==============================================================================
--- packages/slicer/trunk/debian/patches/series (added)
+++ packages/slicer/trunk/debian/patches/series Wed Sep 16 19:28:00 2009
@@ -1,0 +1,1 @@
+50_all_changes.diff

Modified: packages/slicer/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/rules?rev=35858&op=diff
==============================================================================
--- packages/slicer/trunk/debian/rules (original)
+++ packages/slicer/trunk/debian/rules Wed Sep 16 19:28:00 2009
@@ -2,10 +2,8 @@
 
 PACKAGE=slicer
 
-# DPatch
 DEB_SOURCE_PACKAGE:=$(PACKAGE)
-include /usr/share/dpatch/dpatch.make
-
+include /usr/share/quilt/quilt.make 
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=0
@@ -46,7 +44,7 @@
 	/bin/sh $(CURDIR)/debian/get-orig-source
 
 configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	# Add here commands to configure the package.
 
@@ -58,10 +56,8 @@
               && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON
 
 	touch $@
-
-
-build: build-stamp
-build-stamp: configure
+ 
+build: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -79,9 +75,7 @@
 	touch $@
 
 
-clean: clean-patched unpatch
-
-clean-patched:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp install-stamp
@@ -92,7 +86,7 @@
 	dh_clean --exclude ./Libs/FreeSurfer/Testing/TestData/lh.dart.orig
 
 install: install-stamp
-install-stamp: build-stamp
+install-stamp: build
 	dh_testdir
 	dh_testroot
 	dh_prep --exclude ./Libs/FreeSurfer/Testing/TestData/lh.dart.orig
@@ -141,7 +135,7 @@
 	dh_shlibdeps -i
 	dh_gencontrol -i
 	dh_md5sums -i
-	dh_builddeb -i
+	dh_builddeb -i -- -Z bzip2
 
 
 
@@ -164,7 +158,7 @@
 	dh_shlibdeps -a -l $(CURDIR)/debian/tmp/usr/lib:$(CURDIR)/debian/tmp/usr/lib/Slicer3:$(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules
 	dh_gencontrol -a
 	dh_md5sums -a
-	dh_builddeb -a
+	dh_builddeb -a -- -Z bzip2
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure




More information about the debian-science-commits mailing list