r10697 - /packages/slicer/trunk/debian/patches/50_all_changes.dpatch
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Sun Sep 7 19:42:09 UTC 2008
Author: domibel-guest
Date: Sun Sep 7 19:42:09 2008
New Revision: 10697
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=10697
Log:
new upstream release
Added:
packages/slicer/trunk/debian/patches/50_all_changes.dpatch (with props)
Added: 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=10697&op=file
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.dpatch (added)
+++ packages/slicer/trunk/debian/patches/50_all_changes.dpatch Sun Sep 7 19:42:09 2008
@@ -1,0 +1,277 @@
+#! /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: No description.
+
+ at DPATCH@
+diff -urNad slicer-3.2.0~/Applications/CLI/DiffusionApplications/CMakeLists.txt slicer-3.2.0/Applications/CLI/DiffusionApplications/CMakeLists.txt
+--- slicer-3.2.0~/Applications/CLI/DiffusionApplications/CMakeLists.txt 2008-09-06 21:07:33.000000000 +0200
++++ slicer-3.2.0/Applications/CLI/DiffusionApplications/CMakeLists.txt 2008-09-07 18:00:30.000000000 +0200
+@@ -3,5 +3,5 @@
+ SUBDIRS(
+ dwiNoiseFilter
+ StochasticTractographyFilter
+- ResampleDTI
++# ResampleDTI
+ )
+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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Applications/GUI/CMakeLists.txt 2008-09-07 17:58:12.000000000 +0200
+@@ -95,8 +95,11 @@
+ # --------------------------------------------------------------------------
+ # 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
+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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Base/Logic/vtkImageConnectivity.cxx 2008-09-07 17:58:12.000000000 +0200
+@@ -18,6 +18,7 @@
+
+ #include <string.h>
+ #include <assert.h>
++#include <limits.h>
+
+ //------------------------------------------------------------------------------
+ vtkImageConnectivity* vtkImageConnectivity::New()
+diff -urNad slicer-3.2.0~/CMakeLists.txt slicer-3.2.0/CMakeLists.txt
+--- slicer-3.2.0~/CMakeLists.txt 2008-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/CMakeLists.txt 2008-09-07 17:58:12.000000000 +0200
+@@ -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
+@@ -159,10 +163,12 @@
+ include(${TEEM_USE_FILE})
+
+ ## SlicerLibCurl
+-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)
+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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/LoadableModule/ModuleProcessInformation.h 2008-09-07 17:58:12.000000000 +0200
+@@ -16,6 +16,7 @@
+ #define __ModuleProcessInformation_h
+
+ #include <ostream>
++#include <cstring>
+
+ extern "C" {
+ struct ModuleProcessInformation
+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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/ModuleDescriptionParser/ModuleDescription.h 2008-09-07 17:58:12.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/ModuleDescriptionParser/ModuleProcessInformation.h 2008-09-07 17:58:12.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/Qdec/QdecDataTable.cpp 2008-09-07 17:58:13.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/Qdec/QdecFactor.h 2008-09-07 17:58:13.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/Qdec/QdecGlmFit.h 2008-09-07 17:58:13.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/Qdec/QdecProject.cpp 2008-09-07 17:58:13.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/Qdec/QdecUtilities.cpp 2008-09-07 17:58:13.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/RemoteIO/CMakeLists.txt 2008-09-07 17:58:13.000000000 +0200
+@@ -11,8 +11,10 @@
+ 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})
+
+ # 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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Libs/RemoteIO/vtkHTTPHandler.h 2008-09-07 17:58:13.000000000 +0200
+@@ -5,7 +5,7 @@
+ #pragma warning ( disable : 4786 )
+ #endif
+
+-#include <slicerlibcurl/slicerlibcurl.h>
++#include <curl/curl.h>
+
+ #include <vtkRemoteIOConfigure.h>
+ #include "vtkRemoteIO.h"
+diff -urNad slicer-3.2.0~/Modules/CMakeLists.txt slicer-3.2.0/Modules/CMakeLists.txt
+--- slicer-3.2.0~/Modules/CMakeLists.txt 2008-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Modules/CMakeLists.txt 2008-09-07 17:58:13.000000000 +0200
+@@ -48,12 +48,12 @@
+ Python
+ PythonGADScriptedModule
+ QdecModule
+- QueryAtlas
++# QueryAtlas
+ ScriptedModule
+ SlicerDaemon
+ Statistics
+ Tractography
+- VolumeRendering
++# 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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Modules/EMSegment/Algorithm/vtkTimeDef.h 2008-09-07 17:58:13.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Modules/QueryAtlas/vtkTextureText.h 2008-09-07 17:58:14.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLVolumeTextureMapper3D.cxx 2008-09-07 17:58:14.000000000 +0200
+@@ -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-09-07 17:54:46.000000000 +0200
++++ slicer-3.2.0/Modules/VolumeRendering/VolumeRenderingReplacements/vtkSlicerVolumeRenderingFactory.cxx 2008-09-07 17:58:14.000000000 +0200
+@@ -16,7 +16,7 @@
+
+ #include "vtkSlicerVolumeRenderingFactory.h"
+ #include "vtkToolkits.h"
+-#include "vtkVolumeRenderingToolkit.h"
++//#include "vtkVolumeRenderingToolkit.h"
+ #include "vtkDebugLeaks.h"
+ #include "vtkGraphicsFactory.h"
+
Propchange: packages/slicer/trunk/debian/patches/50_all_changes.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the debian-science-commits
mailing list