r35589 - in /packages/slicer/trunk/debian: Notes changelog control patches/50_all_changes.dpatch rules
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Thu Mar 19 02:38:38 UTC 2009
Author: domibel-guest
Date: Thu Mar 19 02:38:34 2009
New Revision: 35589
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35589
Log:
preparation for 3.3
Added:
packages/slicer/trunk/debian/Notes
Modified:
packages/slicer/trunk/debian/changelog
packages/slicer/trunk/debian/control
packages/slicer/trunk/debian/patches/50_all_changes.dpatch
packages/slicer/trunk/debian/rules
Added: packages/slicer/trunk/debian/Notes
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/Notes?rev=35589&op=file
==============================================================================
--- packages/slicer/trunk/debian/Notes (added)
+++ packages/slicer/trunk/debian/Notes Thu Mar 19 02:38:34 2009
@@ -1,0 +1,25 @@
+
+ * SHLIBS ARE BROKEN
+
+
+ * uncommented in : Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLVolumeTextureMapper3D.cxx
+ /*
+ #include "vtkVolumeTextureMapper3D_OneComponentNoShadeFP.cxx"
+ #include "vtkVolumeTextureMapper3D_OneComponentShadeFP.cxx"
+ #include "vtkVolumeTextureMapper3D_TwoDependentNoShadeFP.cxx"
+ #include "vtkVolumeTextureMapper3D_TwoDependentShadeFP.cxx"
+ #include "vtkVolumeTextureMapper3D_FourDependentNoShadeFP.cxx"
+ #include "vtkVolumeTextureMapper3D_FourDependentShadeFP.cxx"
+ */
+
+ * VOLUMERENDERINGMODULE = ON
+
+ * using debian curl version
+
+ * VOLUMERENDERINGMODULE = OFF
+
+/tmp/slicer-3.0.0+svn6268/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLVolumeTextureMapper3D.cxx:36:62:
+Fehl$
+ vtkVolumeTextureMapper3D_OneComponentNoShadeFP.cxx: No such file or directory
+
+
Modified: packages/slicer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/changelog?rev=35589&op=diff
==============================================================================
--- packages/slicer/trunk/debian/changelog (original)
+++ packages/slicer/trunk/debian/changelog Thu Mar 19 02:38:34 2009
@@ -1,27 +1,5 @@
-slicer (3.2.0-1) unstable; urgency=low
+slicer (3.3.0~svn8902-1) unstable; urgency=low
- * Initial release
-
- * SHLIBS ARE BROKEN
-
-
- * uncommented in : Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLVolumeTextureMapper3D.cxx
- /*
- #include "vtkVolumeTextureMapper3D_OneComponentNoShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_OneComponentShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_TwoDependentNoShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_TwoDependentShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_FourDependentNoShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_FourDependentShadeFP.cxx"
- */
-
- * VOLUMERENDERINGMODULE = ON
-
- * using debian curl version
-
- * VOLUMERENDERINGMODULE = OFF
- /tmp/slicer-3.0.0+svn6268/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLVolumeTextureMapper3D.cxx:36:62: Fehler:
- vtkVolumeTextureMapper3D_OneComponentNoShadeFP.cxx: No such file or directory
+ * Initial release (Closes: #500841)
-- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 22 Mar 2008 10:08:42 +0000
-
Modified: packages/slicer/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/control?rev=35589&op=diff
==============================================================================
--- packages/slicer/trunk/debian/control (original)
+++ packages/slicer/trunk/debian/control Thu Mar 19 02:38:34 2009
@@ -5,9 +5,9 @@
Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
Build-Depends: dpatch, debhelper (>= 6), 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, uuid-dev
+ libfreetype6-dev, libxext-dev, libvtk5-dev, libteem1-dev
Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/slicer/trunk/
Section: graphics
Modified: packages/slicer/trunk/debian/patches/50_all_changes.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/50_all_changes.dpatch?rev=35589&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.dpatch (original)
+++ packages/slicer/trunk/debian/patches/50_all_changes.dpatch Thu Mar 19 02:38:34 2009
@@ -5,28 +5,10 @@
## DP: No description.
@DPATCH@
-diff -urNad slicer-3.2.0~/Applications/GUI/CMakeLists.txt slicer-3.2.0/Applications/GUI/CMakeLists.txt
---- slicer-3.2.0~/Applications/GUI/CMakeLists.txt 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Applications/GUI/CMakeLists.txt 2008-12-01 00:53:32.000000000 +0100
-@@ -30,7 +30,7 @@
- set(Slicer3_FORWARD_DIR_INSTALL "${Slicer3_EXE_INSTALL}")
- if(WIN32)
- set(Slicer3_FORWARD_PATH_BUILD
-- "\"${Slicer3_FORWARD_DIR_BUILD}\" CONFIG_DIR_POST,\"${VTK_DIR}/bin\" CONFIG_DIR_POST,\"${KWWidgets_RUNTIME_DIRS}\" CONFIG_DIR_POST,\"${ITK_DIR}/bin\" CONFIG_DIR_POST,\"${TEEM_DIR}/bin\" CONFIG_DIR_POST,\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\"")
-+ "\"${Slicer3_FORWARD_DIR_BUILD}\" CONFIG_DIR_POST,\"${VTK_DIR}/bin\" CONFIG_DIR_POST,\"${KWWidgets_RUNTIME_DIRS}\" CONFIG_DIR_POST,\"${ITK_DIR}/bin\" CONFIG_DIR_POST,\"${Teem_DIR}/bin\" CONFIG_DIR_POST,\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\"")
- set(Slicer3_FORWARD_PATH_INSTALL
- "\"../lib/TclTk/bin\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\"")
- if(Slicer3_BUILD_MODULES)
-@@ -43,7 +43,7 @@
- endif(Slicer3_BUILD_CLI)
- else(WIN32)
- 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}\"")
-+ "\"${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\"")
- if(Slicer3_BUILD_MODULES)
-@@ -95,8 +95,11 @@
+diff -urNad slicer-3.3.0~svn8902~/Applications/GUI/CMakeLists.txt slicer-3.3.0~svn8902/Applications/GUI/CMakeLists.txt
+--- slicer-3.3.0~svn8902~/Applications/GUI/CMakeLists.txt 2009-03-18 21:17:55.000000000 -0400
++++ slicer-3.3.0~svn8902/Applications/GUI/CMakeLists.txt 2009-03-18 21:29:20.000000000 -0400
+@@ -95,8 +95,10 @@
# --------------------------------------------------------------------------
# Find SLICERLIBCURL (slicercurl)
#
@@ -36,234 +18,64 @@
+#include(${SLICERLIBCURL_USE_FILE})
+find_package(CURL REQUIRED)
+include(${CURL_INCLUDE_DIRS})
-+
# --------------------------------------------------------------------------
# Include dirs
-diff -urNad slicer-3.2.0~/Base/Logic/vtkImageConnectivity.cxx slicer-3.2.0/Base/Logic/vtkImageConnectivity.cxx
---- slicer-3.2.0~/Base/Logic/vtkImageConnectivity.cxx 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Base/Logic/vtkImageConnectivity.cxx 2008-12-01 00:53:32.000000000 +0100
-@@ -18,6 +18,7 @@
+diff -urNad slicer-3.3.0~svn8902~/CMakeLists.txt slicer-3.3.0~svn8902/CMakeLists.txt
+--- slicer-3.3.0~svn8902~/CMakeLists.txt 2009-03-18 21:21:12.000000000 -0400
++++ slicer-3.3.0~svn8902/CMakeLists.txt 2009-03-18 21:29:20.000000000 -0400
+@@ -27,6 +27,11 @@
- #include <string.h>
- #include <assert.h>
-+#include <limits.h>
+ set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
- //------------------------------------------------------------------------------
- vtkImageConnectivity* vtkImageConnectivity::New()
-diff -urNad slicer-3.2.0~/CMakeLists.txt slicer-3.2.0/CMakeLists.txt
---- slicer-3.2.0~/CMakeLists.txt 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/CMakeLists.txt 2008-12-01 00:53:32.000000000 +0100
-@@ -40,6 +40,10 @@
- test_big_endian(CMAKE_WORDS_BIGENDIAN)
-
- #-----------------------------------------------------------------------------
+# TCL
+find_package(TCL REQUIRED)
+
-+#-----------------------------------------------------------------------------
- # avoid linker bug in Mac OS 10.5
- # see:
- # http://wiki.finkproject.org/index.php/Fink:Packaging:Preparing_for_10.5#OpenGL_Bug
-@@ -152,17 +156,19 @@
- include(${KWWidgets_USE_FILE})
-
- ## Teem
--find_package(TEEM REQUIRED)
--if(NOT TEEM_FOUND)
-- message(FATAL_ERROR "Need TEEM to build")
--endif(NOT TEEM_FOUND)
--include(${TEEM_USE_FILE})
-+find_package(Teem REQUIRED)
-+if(NOT Teem_FOUND)
-+ message(FATAL_ERROR "Need Teem to build")
-+endif(NOT Teem_FOUND)
-+include(${Teem_USE_FILE})
++
++
+ #-----------------------------------------------------------------------------
+ # Disable the warnings that DevStudio 2005 emits wrt to sprintf, strcpu, etc.
+ #
+@@ -159,10 +164,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)
-@@ -223,7 +229,7 @@
- #
- include("${KWWidgets_CMAKE_DIR}/KWWidgetsPathsMacros.cmake")
- set(extra_dirs
-- "${TEEM_DIR}/bin"
-+ "${Teem_DIR}/bin"
- "${BatchMake_DIR}/bin"
- "${Slicer3_HOME}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}"
- "${Slicer3_HOME}/${Slicer3_INSTALL_PLUGINS_LIB_DIR}"
-diff -urNad slicer-3.2.0~/GenerateSlicer3Config.cmake slicer-3.2.0/GenerateSlicer3Config.cmake
---- slicer-3.2.0~/GenerateSlicer3Config.cmake 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/GenerateSlicer3Config.cmake 2008-12-01 00:53:32.000000000 +0100
-@@ -33,7 +33,7 @@
- SET(ITK_DIR_CONFIG ${ITK_DIR})
- SET(VTK_DIR_CONFIG ${VTK_DIR})
- SET(KWWidgets_DIR_CONFIG ${KWWidgets_DIR})
--SET(TEEM_DIR_CONFIG ${TEEM_DIR})
-+SET(Teem_DIR_CONFIG ${Teem_DIR})
-
- # Configure Slicer3Config.cmake for the install tree.
- CONFIGURE_FILE(
-diff -urNad slicer-3.2.0~/Libs/CMakeLists.txt slicer-3.2.0/Libs/CMakeLists.txt
---- slicer-3.2.0~/Libs/CMakeLists.txt 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/CMakeLists.txt 2008-12-01 00:53:32.000000000 +0100
-@@ -10,9 +10,9 @@
- # Note: Order of of SUBDIRS is important if your projects depend
- # on code in other projects (put dependent project later).
-
--if(TEEM_FOUND)
-+if(Teem_FOUND)
- set(dirs ${dirs} vtkTeem)
--endif(TEEM_FOUND)
-+endif(Teem_FOUND)
-
- set(dirs ${dirs}
- vtkITK
-diff -urNad slicer-3.2.0~/Libs/LoadableModule/ModuleProcessInformation.h slicer-3.2.0/Libs/LoadableModule/ModuleProcessInformation.h
---- slicer-3.2.0~/Libs/LoadableModule/ModuleProcessInformation.h 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/LoadableModule/ModuleProcessInformation.h 2008-12-01 00:53:32.000000000 +0100
-@@ -16,6 +16,7 @@
- #define __ModuleProcessInformation_h
-
- #include <ostream>
-+#include <cstring>
-
- extern "C" {
- struct ModuleProcessInformation
-diff -urNad slicer-3.2.0~/Libs/MRML/CMakeLists.txt slicer-3.2.0/Libs/MRML/CMakeLists.txt
---- slicer-3.2.0~/Libs/MRML/CMakeLists.txt 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/MRML/CMakeLists.txt 2008-12-01 00:53:32.000000000 +0100
-@@ -14,8 +14,8 @@
- option(MRML_USE_TEEM "Build MRML with TEEM support." ON)
- mark_as_advanced(MRML_USE_TEEM)
- if(MRML_USE_TEEM)
-- find_package(TEEM REQUIRED)
-- include(${TEEM_USE_FILE})
-+ find_package(Teem REQUIRED)
-+ include(${Teem_USE_FILE})
- option(MRML_USE_vtkTeem "Build MRML with vtkTeem support." ON)
- mark_as_advanced(MRML_USE_vtkTeem)
- endif(MRML_USE_TEEM)
-diff -urNad slicer-3.2.0~/Libs/ModuleDescriptionParser/ModuleDescription.h slicer-3.2.0/Libs/ModuleDescriptionParser/ModuleDescription.h
---- slicer-3.2.0~/Libs/ModuleDescriptionParser/ModuleDescription.h 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/ModuleDescriptionParser/ModuleDescription.h 2008-12-01 00:53:32.000000000 +0100
-@@ -24,6 +24,7 @@
-
- #include <string>
- #include <vector>
-+#include <cstdlib>
-
- class ModuleDescriptionParser_EXPORT ModuleDescription
- {
-diff -urNad slicer-3.2.0~/Libs/ModuleDescriptionParser/ModuleProcessInformation.h slicer-3.2.0/Libs/ModuleDescriptionParser/ModuleProcessInformation.h
---- slicer-3.2.0~/Libs/ModuleDescriptionParser/ModuleProcessInformation.h 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/ModuleDescriptionParser/ModuleProcessInformation.h 2008-12-01 00:53:32.000000000 +0100
-@@ -16,6 +16,7 @@
- #define __ModuleProcessInformation_h
-
- #include <ostream>
-+#include <cstring>
-
- extern "C" {
- struct ModuleProcessInformation
-diff -urNad slicer-3.2.0~/Libs/Qdec/QdecDataTable.cpp slicer-3.2.0/Libs/Qdec/QdecDataTable.cpp
---- slicer-3.2.0~/Libs/Qdec/QdecDataTable.cpp 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/Qdec/QdecDataTable.cpp 2008-12-01 00:53:32.000000000 +0100
-@@ -33,6 +33,9 @@
- #include <fstream>
- #include <sstream>
- #include <cassert>
-+#include <cstring>
-+#include <cstdlib>
-+
-
- #include "QdecDataTable.h"
- #include "QdecUtilities.h"
-diff -urNad slicer-3.2.0~/Libs/Qdec/QdecFactor.h slicer-3.2.0/Libs/Qdec/QdecFactor.h
---- slicer-3.2.0~/Libs/Qdec/QdecFactor.h 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/Qdec/QdecFactor.h 2008-12-01 00:53:32.000000000 +0100
-@@ -36,6 +36,7 @@
- #include <vector>
- #include <string>
- #include <cassert>
-+#include <cstring>
-
- //#include "vtkQdec.h"
-
-diff -urNad slicer-3.2.0~/Libs/Qdec/QdecGlmFit.h slicer-3.2.0/Libs/Qdec/QdecGlmFit.h
---- slicer-3.2.0~/Libs/Qdec/QdecGlmFit.h 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/Qdec/QdecGlmFit.h 2008-12-01 00:53:32.000000000 +0100
-@@ -34,6 +34,8 @@
-
- #include <string>
- #include <vector>
-+#include <cstring>
-+#include <cstdlib>
-
- #include "QdecGlmDesign.h"
- #include "QdecGlmFitResults.h"
-diff -urNad slicer-3.2.0~/Libs/Qdec/QdecProject.cpp slicer-3.2.0/Libs/Qdec/QdecProject.cpp
---- slicer-3.2.0~/Libs/Qdec/QdecProject.cpp 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/Qdec/QdecProject.cpp 2008-12-01 00:53:32.000000000 +0100
-@@ -31,6 +31,8 @@
- #include <sstream>
- #include <iostream>
- #include <fstream>
-+#include <cstdlib>
-+#include <cstring>
-
- #include "QdecProject.h"
-
-diff -urNad slicer-3.2.0~/Libs/Qdec/QdecUtilities.cpp slicer-3.2.0/Libs/Qdec/QdecUtilities.cpp
---- slicer-3.2.0~/Libs/Qdec/QdecUtilities.cpp 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/Qdec/QdecUtilities.cpp 2008-12-01 00:53:32.000000000 +0100
-@@ -29,6 +29,7 @@
-
- #include <fstream>
- #include <stdexcept>
-+#include <cstring>
-
- using namespace std;
-
-diff -urNad slicer-3.2.0~/Libs/RemoteIO/CMakeLists.txt slicer-3.2.0/Libs/RemoteIO/CMakeLists.txt
---- slicer-3.2.0~/Libs/RemoteIO/CMakeLists.txt 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/RemoteIO/CMakeLists.txt 2008-12-01 00:53:32.000000000 +0100
-@@ -11,8 +11,10 @@
+diff -urNad slicer-3.3.0~svn8902~/Libs/RemoteIO/CMakeLists.txt slicer-3.3.0~svn8902/Libs/RemoteIO/CMakeLists.txt
+--- slicer-3.3.0~svn8902~/Libs/RemoteIO/CMakeLists.txt 2009-03-18 21:18:05.000000000 -0400
++++ slicer-3.3.0~svn8902/Libs/RemoteIO/CMakeLists.txt 2009-03-18 21:29: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(SLICERLIBCURL REQUIRED)
-+#include(${SLICERLIBCURL_USE_FILE})
+find_package(CURL REQUIRED)
-+include(${CURL_INCLUDE_DIRS})
++if(CURL_FOUND)
++ # Add include directories needed to use CURL.
++ include_directories(${CURL_INCLUDE_DIRS})
++endif(CURL_FOUND)
# Disable MSVC 8 warnings
if(WIN32)
-@@ -96,7 +98,7 @@
- vtkIOTCL
- vtkCommonTCL
- itksys
-- ${SLICERLIBCURL_LIBRARIES}
-+ ${CURL_LIBRARIES}
- MRML
- )
-
-diff -urNad slicer-3.2.0~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.2.0/Libs/RemoteIO/vtkHTTPHandler.h
---- slicer-3.2.0~/Libs/RemoteIO/vtkHTTPHandler.h 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/RemoteIO/vtkHTTPHandler.h 2008-12-01 00:53:32.000000000 +0100
+diff -urNad slicer-3.3.0~svn8902~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.3.0~svn8902/Libs/RemoteIO/vtkHTTPHandler.h
+--- slicer-3.3.0~svn8902~/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-18 21:18:05.000000000 -0400
++++ slicer-3.3.0~svn8902/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-18 21:29:20.000000000 -0400
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -273,200 +85,15 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
-diff -urNad slicer-3.2.0~/Libs/vtkTeem/CMakeLists.txt slicer-3.2.0/Libs/vtkTeem/CMakeLists.txt
---- slicer-3.2.0~/Libs/vtkTeem/CMakeLists.txt 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Libs/vtkTeem/CMakeLists.txt 2008-12-01 00:53:32.000000000 +0100
-@@ -8,8 +8,8 @@
- find_package(VTK REQUIRED)
- include(${VTK_USE_FILE})
-
--find_package(TEEM REQUIRED)
--include(${TEEM_USE_FILE})
-+find_package(Teem REQUIRED)
-+include(${Teem_USE_FILE})
-
- if(NOT DEFINED BUILD_SHARED_LIBS)
- option(BUILD_SHARED_LIBS "Build with shared libraries." ON)
-@@ -92,15 +92,15 @@
- )
-
- # after teem 1.9, all the teem libraries are groups in one big libteem.so
--if ( ${TEEM_VERSION_MAJOR} GREATER 1 )
-- set(TEEM_LIBRARIES teem)
--else ( ${TEEM_VERSION_MAJOR} GREATER 1 )
-- if ( ${TEEM_VERSION_MINOR} LESS 10 )
-- set(TEEM_LIBRARIES air biff nrrd ten ell)
-- else ( ${TEEM_VERSION_MINOR} LESS 10 )
-- set(TEEM_LIBRARIES teem)
-- endif ( ${TEEM_VERSION_MINOR} LESS 10 )
--endif ( ${TEEM_VERSION_MAJOR} GREATER 1 )
-+if ( ${Teem_VERSION_MAJOR} GREATER 1 )
-+ set(Teem_LIBRARIES teem)
-+else ( ${Teem_VERSION_MAJOR} GREATER 1 )
-+ if ( ${Teem_VERSION_MINOR} LESS 10 )
-+ set(Teem_LIBRARIES air biff nrrd ten ell)
-+ else ( ${Teem_VERSION_MINOR} LESS 10 )
-+ set(Teem_LIBRARIES teem)
-+ endif ( ${Teem_VERSION_MINOR} LESS 10 )
-+endif ( ${Teem_VERSION_MAJOR} GREATER 1 )
-
- target_link_libraries(${lib_name}
- vtkCommon
-diff -urNad slicer-3.2.0~/Modules/CMakeLists.txt slicer-3.2.0/Modules/CMakeLists.txt
---- slicer-3.2.0~/Modules/CMakeLists.txt 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Modules/CMakeLists.txt 2008-12-01 00:53:32.000000000 +0100
-@@ -48,12 +48,12 @@
- Python
- PythonGADScriptedModule
- QdecModule
-- QueryAtlas
-+# QueryAtlas
- ScriptedModule
- SlicerDaemon
+diff -urNad slicer-3.3.0~svn8902~/Modules/CMakeLists.txt slicer-3.3.0~svn8902/Modules/CMakeLists.txt
+--- slicer-3.3.0~svn8902~/Modules/CMakeLists.txt 2009-03-18 21:19:26.000000000 -0400
++++ slicer-3.3.0~svn8902/Modules/CMakeLists.txt 2009-03-18 21:29:20.000000000 -0400
+@@ -56,7 +56,7 @@
Statistics
Tractography
-- VolumeRendering
-+# VolumeRendering
+ # TumorGrowth
+- ChangeTracker # AF: refactoring TumorGrowth...
++# ChangeTracker # AF: refactoring TumorGrowth...
+ VolumeRendering
# WFEngineModule <- can't work with 2.6 and Win32??
# MRAblation <- not working either
- Volumes
-diff -urNad slicer-3.2.0~/Modules/EMSegment/Algorithm/vtkTimeDef.h slicer-3.2.0/Modules/EMSegment/Algorithm/vtkTimeDef.h
---- slicer-3.2.0~/Modules/EMSegment/Algorithm/vtkTimeDef.h 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Modules/EMSegment/Algorithm/vtkTimeDef.h 2008-12-01 00:53:32.000000000 +0100
-@@ -21,7 +21,7 @@
- #ifndef _WIN32
- #include <stdio.h>
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
- #include <errno.h>
- #include <sys/time.h>
-
-diff -urNad slicer-3.2.0~/Modules/QueryAtlas/vtkTextureText.h slicer-3.2.0/Modules/QueryAtlas/vtkTextureText.h
---- slicer-3.2.0~/Modules/QueryAtlas/vtkTextureText.h 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Modules/QueryAtlas/vtkTextureText.h 2008-12-01 00:53:33.000000000 +0100
-@@ -37,7 +37,7 @@
- #ifdef _WIN32 // WINDOWS
- #include <vector>
- #else // UNIX
--#include <vector.h>
-+#include <vector>
- #endif
-
-
-diff -urNad slicer-3.2.0~/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLVolumeTextureMapper3D.cxx slicer-3.2.0/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLVolumeTextureMapper3D.cxx
---- slicer-3.2.0~/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLVolumeTextureMapper3D.cxx 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLVolumeTextureMapper3D.cxx 2008-12-01 00:53:33.000000000 +0100
-@@ -33,12 +33,14 @@
- #include "vtkOpenGLExtensionManager.h"
- #include "vtkgl.h"
- #include "vtkCommand.h"
-+/*
- #include "vtkVolumeTextureMapper3D_OneComponentNoShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_OneComponentShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_TwoDependentNoShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_TwoDependentShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_FourDependentNoShadeFP.cxx"
- #include "vtkVolumeTextureMapper3D_FourDependentShadeFP.cxx"
-+*/
-
- extern const char* vtkVolumeTextureMapper3D_OneComponentShadeFP;
- extern const char* vtkVolumeTextureMapper3D_OneComponentNoShadeFP;
-diff -urNad slicer-3.2.0~/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerVolumeRenderingFactory.cxx slicer-3.2.0/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerVolumeRenderingFactory.cxx
---- slicer-3.2.0~/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerVolumeRenderingFactory.cxx 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerVolumeRenderingFactory.cxx 2008-12-01 00:53:33.000000000 +0100
-@@ -16,7 +16,7 @@
-
- #include "vtkSlicerVolumeRenderingFactory.h"
- #include "vtkToolkits.h"
--#include "vtkVolumeRenderingToolkit.h"
-+//#include "vtkVolumeRenderingToolkit.h"
- #include "vtkDebugLeaks.h"
- #include "vtkGraphicsFactory.h"
-
-diff -urNad slicer-3.2.0~/Slicer3Config.cmake.in slicer-3.2.0/Slicer3Config.cmake.in
---- slicer-3.2.0~/Slicer3Config.cmake.in 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Slicer3Config.cmake.in 2008-12-01 00:53:33.000000000 +0100
-@@ -95,5 +95,5 @@
- set(LoadableModule_DIR "@LoadableModule_DIR_CONFIG@")
- set(ModuleDescriptionParser_DIR "@ModuleDescriptionParser_DIR_CONFIG@")
- set(TCLAP_DIR "@TCLAP_DIR_CONFIG@")
--set(TEEM_DIR "@TEEM_DIR_CONFIG@")
-+set(Teem_DIR "@Teem_DIR_CONFIG@")
- set(VTK_DIR "@VTK_DIR_CONFIG@")
-diff -urNad slicer-3.2.0~/Slicer3InstallConfig.cmake.in slicer-3.2.0/Slicer3InstallConfig.cmake.in
---- slicer-3.2.0~/Slicer3InstallConfig.cmake.in 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Slicer3InstallConfig.cmake.in 2008-12-01 00:53:33.000000000 +0100
-@@ -139,5 +139,5 @@
- set(LoadableModule_DIR "${Slicer3_HOME}/lib/LoadableModule")
- set(ModuleDescriptionParser_DIR "${Slicer3_HOME}/lib/ModuleDescriptionParser")
- set(TCLAP_DIR "${Slicer3_HOME}/lib/tclap")
--set(TEEM_DIR "${Slicer3_HOME}/lib/TEEM- at TEEM_VERSION_MAJOR@. at TEEM_VERSION_MINOR@")
-+set(Teem_DIR "${Slicer3_HOME}/lib/TEEM- at TEEM_VERSION_MAJOR@. at TEEM_VERSION_MINOR@")
- set(VTK_DIR "${Slicer3_HOME}/lib/vtk- at VTK_MAJOR_VERSION@. at VTK_MINOR_VERSION@")
-diff -urNad slicer-3.2.0~/UseSlicer3.cmake.in slicer-3.2.0/UseSlicer3.cmake.in
---- slicer-3.2.0~/UseSlicer3.cmake.in 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/UseSlicer3.cmake.in 2008-12-01 00:53:33.000000000 +0100
-@@ -28,10 +28,10 @@
- include(${KWWidgets_USE_FILE})
- endif(KWWidgets_FOUND)
-
--find_package(TEEM REQUIRED)
--if(TEEM_FOUND)
-- include(${TEEM_USE_FILE})
--endif(TEEM_FOUND)
-+find_package(Teem REQUIRED)
-+if(Teem_FOUND)
-+ include(${Teem_USE_FILE})
-+endif(Teem_FOUND)
-
- # Add compiler flags needed to use Slicer3.
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Slicer3_REQUIRED_C_FLAGS}")
-diff -urNad slicer-3.2.0~/Utilities/Package/CMakeLists.txt slicer-3.2.0/Utilities/Package/CMakeLists.txt
---- slicer-3.2.0~/Utilities/Package/CMakeLists.txt 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/Utilities/Package/CMakeLists.txt 2008-12-01 00:53:33.000000000 +0100
-@@ -54,9 +54,9 @@
- if(EXISTS "${KWWidgets_DIR}/CMakeCache.txt")
- set(CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${KWWidgets_DIR};KWWidgets;ALL;/")
- endif(EXISTS "${KWWidgets_DIR}/CMakeCache.txt")
--if(EXISTS "${TEEM_DIR}/CMakeCache.txt")
-- set(CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${TEEM_DIR};teem;ALL;/")
--endif(EXISTS "${TEEM_DIR}/CMakeCache.txt")
-+if(EXISTS "${Teem_DIR}/CMakeCache.txt")
-+ set(CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${Teem_DIR};teem;ALL;/")
-+endif(EXISTS "${Teem_DIR}/CMakeCache.txt")
- if(APPLE)
- set(CPACK_PACKAGE_ICON "${Slicer3_SOURCE_DIR}/Utilities/Package/Slicer3.icns")
- endif(APPLE)
-diff -urNad slicer-3.2.0~/launch.tcl.in slicer-3.2.0/launch.tcl.in
---- slicer-3.2.0~/launch.tcl.in 2008-12-01 00:52:49.000000000 +0100
-+++ slicer-3.2.0/launch.tcl.in 2008-12-01 00:53:33.000000000 +0100
-@@ -130,7 +130,7 @@
- set ::env(SlicerIO_DIR) $::env(Slicer3_HOME)/lib/SlicerIO
- set ::env(tclap_DIR) $::env(Slicer3_HOME)/lib/tclap
- set ::env(vtkITK_DIR) $::env(Slicer3_HOME)/lib/vtkITK
-- set ::env(vtkTeem_DIR) $::env(Slicer3_HOME)/lib/vtkTeem
-+ #set ::env(vtkTeem_DIR) $::env(Slicer3_HOME)/lib/vtkTeem
-
- # Slicer3 Base
-
-@@ -164,8 +164,8 @@
- if { [file exists "@ITK_DIR@/bin/$buildType/ITKCommon.dll"] } {
- set ::ITK_BUILD_SUBDIR $buildType
- }
-- if { [file exists "@TEEM_DIR@/bin/$buildType/air.dll"] } {
-- set ::TEEM_BUILD_SUBDIR $buildType
-+ if { [file exists "@Teem_DIR@/bin/$buildType/air.dll"] } {
-+ set ::Teem_BUILD_SUBDIR $buildType
- }
- }
- } else {
-@@ -187,7 +187,7 @@
- set ::env(TCL_DIR) [file normalize [file dirname [file dirname "@TCL_LIBRARY@"]]]
- set ::env(TCL_LIBRARY) "$::env(TCL_DIR)/lib/tcl at TCL_TK_VERSION_DOT@"
-
-- set ::env(TEEM_DIR) [file normalize "@TEEM_DIR@/bin/$::TEEM_BUILD_SUBDIR"]
-+ set ::env(Teem_DIR) [file normalize "@Teem_DIR@/bin/$::TEEM_BUILD_SUBDIR"]
-
- # Slicer3 Libs
-
Modified: packages/slicer/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/rules?rev=35589&op=diff
==============================================================================
--- packages/slicer/trunk/debian/rules (original)
+++ packages/slicer/trunk/debian/rules Thu Mar 19 02:38:34 2009
@@ -13,15 +13,15 @@
SHARED_BUILD_PATH = DEB_build_shared
CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_CXX_FLAGS="-Wno-deprecated" \
- -DVOLUMERENDERINGMODULE:BOOL=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
+ -DTEEM_DIR:PATH=/usr/lib/Teem-1.10.0 \
+ -DVOLUMERENDERINGMODULE:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=ON \
- -DBUILD_TESTING:BOOL=ON \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
+ -DBUILD_TESTING:BOOL=OFF \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
- -DSlicer3_USE_IGSTK::BOOL=OFF
-
-# -DTEEM_DIR:PATH=/usr/lib/Teem-1.10.0 \
+ -DSlicer3_USE_IGSTK:BOOL=OFF \
+ -DSlicer3_USE_OPENIGTLINK:BOOL=OFF
CFLAGS = -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
More information about the debian-science-commits
mailing list