[med-svn] r7673 - trunk/packages/volview/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Sep 5 16:03:21 UTC 2011
Author: malat-guest
Date: 2011-09-05 16:03:21 +0000 (Mon, 05 Sep 2011)
New Revision: 7673
Added:
trunk/packages/volview/trunk/debian/patches/fixupcurl.patch
trunk/packages/volview/trunk/debian/patches/fixuptar.patch
trunk/packages/volview/trunk/debian/patches/fixuptcl.patch
Modified:
trunk/packages/volview/trunk/debian/patches/fixmath.patch
trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch
trunk/packages/volview/trunk/debian/patches/series
Log:
reshuffle bits
Modified: trunk/packages/volview/trunk/debian/patches/fixmath.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixmath.patch 2011-09-05 15:57:46 UTC (rev 7672)
+++ trunk/packages/volview/trunk/debian/patches/fixmath.patch 2011-09-05 16:03:21 UTC (rev 7673)
@@ -1,52 +1,4 @@
-Description: Upstream changes introduced in version 3.4-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- volview (3.4-1) unstable; urgency=low
- .
- * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
- .
- The person named in the Author field signed this changelog entry.
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:43:57.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:43:58.000000000 +0000
-@@ -3644,7 +3644,7 @@
- if (this->VolumeMapper)
- {
- this->AddVolumeMapperProgress(
-- this->VolumeMapper,
-+ (vtkVolumeMapper*)this->VolumeMapper,
- ks_("Progress|Generating Image"));
-
- this->AddVolumeMapperGradientProgress(
-@@ -3727,8 +3727,8 @@
- if (this->VolumeMapper)
- {
- this->VolumeMapper->SetRequestedRenderMode(
-- *iarg ? vtkKWEVolumeMapper::DefaultRenderMode
-- : vtkKWEVolumeMapper::RayCastAndTextureRenderMode);
-+ *iarg ? vtkSmartVolumeMapper::DefaultRenderMode
-+ : vtkSmartVolumeMapper::RayCastAndTextureRenderMode);
- }
-
- case vtkCommand::VolumeMapperRenderStartEvent:
+Fix new API in VTK for converting radian to degree
Index: volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx
===================================================================
--- volview-3.4.orig/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx 2011-09-05 15:43:10.000000000 +0000
@@ -60,21 +12,6 @@
// Manipulate the transform to reflect the rotation
this->Transform->Identity();
-Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-05 15:43:53.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-05 15:43:58.000000000 +0000
-@@ -15,7 +15,9 @@
- ENDIF(COMMAND CMAKE_POLICY)
-
- PROJECT(KWWidgetsPro)
--
-+include_directories(
-+ ${TCL_INCLUDE_PATH}
-+)
- # --------------------------------------------------------------------------
- # To use this library in a larger project you will need to SUBDIR into this
- # directory so that it gets built and then you will use the following variables
Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx
===================================================================
--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx 2011-09-05 15:43:10.000000000 +0000
@@ -101,35 +38,6 @@
widget->TiltPlane(rxf, ryf);
this->InvokeEvent(vtkKWEvent::ResliceChangingEvent, NULL);
-Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-05 15:43:53.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-05 15:43:58.000000000 +0000
-@@ -16,7 +16,10 @@
-
-
- PROJECT(KWVolView)
--
-+include_directories(
-+ ${TCL_INCLUDE_PATH}
-+ /usr/include/VTKEdge
-+ )
- INCLUDE_REGULAR_EXPRESSION("^.*$")
-
- # --------------------------------------------------------------------------
-@@ -540,8 +543,10 @@
- TARGET_LINK_LIBRARIES(KWVolView
- ${KWWidgetsPro_LIBRARIES}
- ${VTKEdge_LIBRARIES}
-- cmtar
-- Curl
-+ vtkKWEWidgets
-+ vtkKWEVolumeRendering
-+ #cmtar
-+ curl
- )
-
- IF(KWVolView_USE_GDCM)
Index: volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx
===================================================================
--- volview-3.4.orig/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx 2011-09-05 15:43:10.000000000 +0000
@@ -296,101 +204,3 @@
vtkStandardNewMacro ( vtkHTTPHandler );
vtkCxxRevisionMacro ( vtkHTTPHandler, "$Revision: 1.10 $" );
-Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 15:43:10.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 15:43:58.000000000 +0000
-@@ -16,7 +16,7 @@
- #pragma warning ( disable : 4786 )
- #endif
-
--#include "Curl/curl/curl.h"
-+#include "curl/curl.h"
- #include "vtkObjectFactory.h"
- #include <vtksys/SystemTools.hxx>
- #include <vtksys/Process.h>
-Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 15:43:10.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 15:43:58.000000000 +0000
-@@ -13,7 +13,7 @@
- #include "vtkURIHandler.h"
- #include "vtkKWRemoteIOManager.h"
-
--#include "Curl/curl/mprintf.h"
-+#include "curl/mprintf.h"
-
- //------------------------------------------------------------------------------
- // The point of this function would be to return a string of the input data,
-Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 15:43:10.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 15:43:58.000000000 +0000
-@@ -21,8 +21,8 @@
- #endif
-
- #include "vtkObjectFactory.h"
--#include <libtar/libtar.h>
--#include <libtar/config.h>
-+#include <libtar.h>
-+//#include <libtar/config.h>
-
- #include <stdio.h>
- #include <fcntl.h>
-@@ -47,7 +47,7 @@
- # include <signal.h>
- #endif
-
--# include <vtkzlib/zlib.h>
-+# include <vtk_zlib.h>
- # define cm_zlib_gzdopen gzdopen
- # define cm_zlib_gzclose gzclose
- # define cm_zlib_gzread gzread
-@@ -173,6 +173,7 @@
- const char* rootDirectory,
- bool gzip, bool verbose)
- {
-+#if 0
- TAR *t;
- char buf[TAR_MAXPATHLEN];
- char pathname[TAR_MAXPATHLEN];
-@@ -244,6 +245,7 @@
- vtkGenericWarningMacro("Problem with tar_close(): ");
- return 0;
- }
-+#endif
- return 1;
- }
-
-@@ -253,7 +255,7 @@
- const char *root_name,
- bool gzip)
- {
--
-+#if 0
- TAR *t;
-
- vtkKWRemoteIOUtilitiesGZStruct gzs;
-@@ -316,6 +318,7 @@
- vtkGenericWarningMacro( << "Problem with tar_close(): " );
- return 0;
- }
-+#endif
- return 1;
- }
-
-Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt
-===================================================================
---- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt 2011-09-05 15:43:10.000000000 +0000
-+++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt 2011-09-05 15:43:58.000000000 +0000
-@@ -15,7 +15,9 @@
- ENDIF(COMMAND CMAKE_POLICY)
-
- PROJECT(VolView)
--
-+include_directories(
-+ ${TCL_INCLUDE_PATH}
-+ )
- # --------------------------------------------------------------------------
- # We need VolViewLibraries
-
Added: trunk/packages/volview/trunk/debian/patches/fixupcurl.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixupcurl.patch (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/fixupcurl.patch 2011-09-05 16:03:21 UTC (rev 7673)
@@ -0,0 +1,27 @@
+Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 15:43:58.000000000 +0000
+@@ -13,7 +13,7 @@
+ #include "vtkURIHandler.h"
+ #include "vtkKWRemoteIOManager.h"
+
+-#include "Curl/curl/mprintf.h"
++#include "curl/mprintf.h"
+
+ //------------------------------------------------------------------------------
+ // The point of this function would be to return a string of the input data,
+Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 15:43:58.000000000 +0000
+@@ -16,7 +16,7 @@
+ #pragma warning ( disable : 4786 )
+ #endif
+
+-#include "Curl/curl/curl.h"
++#include "curl/curl.h"
+ #include "vtkObjectFactory.h"
+ #include <vtksys/SystemTools.hxx>
+ #include <vtksys/Process.h>
+
Added: trunk/packages/volview/trunk/debian/patches/fixuptar.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixuptar.patch (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/fixuptar.patch 2011-09-05 16:03:21 UTC (rev 7673)
@@ -0,0 +1,58 @@
+Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 15:43:58.000000000 +0000
+@@ -21,8 +21,8 @@
+ #endif
+
+ #include "vtkObjectFactory.h"
+-#include <libtar/libtar.h>
+-#include <libtar/config.h>
++#include <libtar.h>
++//#include <libtar/config.h>
+
+ #include <stdio.h>
+ #include <fcntl.h>
+@@ -47,7 +47,7 @@
+ # include <signal.h>
+ #endif
+
+-# include <vtkzlib/zlib.h>
++# include <vtk_zlib.h>
+ # define cm_zlib_gzdopen gzdopen
+ # define cm_zlib_gzclose gzclose
+ # define cm_zlib_gzread gzread
+@@ -173,6 +173,7 @@
+ const char* rootDirectory,
+ bool gzip, bool verbose)
+ {
++#if 0
+ TAR *t;
+ char buf[TAR_MAXPATHLEN];
+ char pathname[TAR_MAXPATHLEN];
+@@ -244,6 +245,7 @@
+ vtkGenericWarningMacro("Problem with tar_close(): ");
+ return 0;
+ }
++#endif
+ return 1;
+ }
+
+@@ -253,7 +255,7 @@
+ const char *root_name,
+ bool gzip)
+ {
+-
++#if 0
+ TAR *t;
+
+ vtkKWRemoteIOUtilitiesGZStruct gzs;
+@@ -316,6 +318,7 @@
+ vtkGenericWarningMacro( << "Problem with tar_close(): " );
+ return 0;
+ }
++#endif
+ return 1;
+ }
+
+
Added: trunk/packages/volview/trunk/debian/patches/fixuptcl.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixuptcl.patch (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/fixuptcl.patch 2011-09-05 16:03:21 UTC (rev 7673)
@@ -0,0 +1,58 @@
+Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt 2011-09-05 15:43:58.000000000 +0000
+@@ -15,7 +15,9 @@
+ ENDIF(COMMAND CMAKE_POLICY)
+
+ PROJECT(VolView)
+-
++include_directories(
++ ${TCL_INCLUDE_PATH}
++ )
+ # --------------------------------------------------------------------------
+ # We need VolViewLibraries
+Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-05 15:43:53.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-05 15:43:58.000000000 +0000
+@@ -16,7 +16,10 @@
+
+
+ PROJECT(KWVolView)
+-
++include_directories(
++ ${TCL_INCLUDE_PATH}
++ /usr/include/VTKEdge
++ )
+ INCLUDE_REGULAR_EXPRESSION("^.*$")
+
+ # --------------------------------------------------------------------------
+@@ -540,8 +543,10 @@
+ TARGET_LINK_LIBRARIES(KWVolView
+ ${KWWidgetsPro_LIBRARIES}
+ ${VTKEdge_LIBRARIES}
+- cmtar
+- Curl
++ vtkKWEWidgets
++ vtkKWEVolumeRendering
++ #cmtar
++ curl
+ )
+
+ IF(KWVolView_USE_GDCM)
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-05 15:43:53.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-05 15:43:58.000000000 +0000
+@@ -15,7 +15,9 @@
+ ENDIF(COMMAND CMAKE_POLICY)
+
+ PROJECT(KWWidgetsPro)
+-
++include_directories(
++ ${TCL_INCLUDE_PATH}
++)
+ # --------------------------------------------------------------------------
+ # To use this library in a larger project you will need to SUBDIR into this
+ # directory so that it gets built and then you will use the following variables
Modified: trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch 2011-09-05 15:57:46 UTC (rev 7672)
+++ trunk/packages/volview/trunk/debian/patches/kwevm_smartvm.patch 2011-09-05 16:03:21 UTC (rev 7673)
@@ -2,6 +2,30 @@
(after VTK 5.4 transition)
Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:43:57.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:43:58.000000000 +0000
+@@ -3644,7 +3644,7 @@
+ if (this->VolumeMapper)
+ {
+ this->AddVolumeMapperProgress(
+- this->VolumeMapper,
++ (vtkVolumeMapper*)this->VolumeMapper,
+ ks_("Progress|Generating Image"));
+
+ this->AddVolumeMapperGradientProgress(
+@@ -3727,8 +3727,8 @@
+ if (this->VolumeMapper)
+ {
+ this->VolumeMapper->SetRequestedRenderMode(
+- *iarg ? vtkKWEVolumeMapper::DefaultRenderMode
+- : vtkKWEVolumeMapper::RayCastAndTextureRenderMode);
++ *iarg ? vtkSmartVolumeMapper::DefaultRenderMode
++ : vtkSmartVolumeMapper::RayCastAndTextureRenderMode);
+ }
+
+ case vtkCommand::VolumeMapperRenderStartEvent:
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
+===================================================================
--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:49:50.000000000 +0000
+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:49:52.000000000 +0000
@@ -52,7 +52,7 @@
Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series 2011-09-05 15:57:46 UTC (rev 7672)
+++ trunk/packages/volview/trunk/debian/patches/series 2011-09-05 16:03:21 UTC (rev 7673)
@@ -5,3 +5,6 @@
fixmath.patch
removemarkov.patch
kwevm_smartvm.patch
+fixuptcl.patch
+fixuptar.patch
+fixupcurl.patch
More information about the debian-med-commit
mailing list