[med-svn] r7674 - trunk/packages/volview/trunk/debian/patches

Mathieu Malaterre malat-guest at alioth.debian.org
Mon Sep 5 16:07:29 UTC 2011 

Author: malat-guest
Date: 2011-09-05 16:07:29 +0000 (Mon, 05 Sep 2011)
New Revision: 7674

Modified:
   trunk/packages/volview/trunk/debian/patches/fixmath.patch
   trunk/packages/volview/trunk/debian/patches/fixupcurl.patch
   trunk/packages/volview/trunk/debian/patches/fixuptar.patch
   trunk/packages/volview/trunk/debian/patches/fixuptcl.patch
Log:
add some comments

Modified: trunk/packages/volview/trunk/debian/patches/fixmath.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixmath.patch	2011-09-05 16:03:21 UTC (rev 7673)
+++ trunk/packages/volview/trunk/debian/patches/fixmath.patch	2011-09-05 16:07:29 UTC (rev 7674)
@@ -191,16 +191,3 @@
      }
  }
  
-Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 15:43:10.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 15:43:58.000000000 +0000
-@@ -12,7 +12,7 @@
- #include "vtkHTTPHandler.h"
- #include "vtkKWRemoteIOUtilities.h"
- 
--#include "Curl/curl/mprintf.h"
-+#include "curl/mprintf.h"
- 
- vtkStandardNewMacro ( vtkHTTPHandler );
- vtkCxxRevisionMacro ( vtkHTTPHandler, "$Revision: 1.10 $" );

Modified: trunk/packages/volview/trunk/debian/patches/fixupcurl.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixupcurl.patch	2011-09-05 16:03:21 UTC (rev 7673)
+++ trunk/packages/volview/trunk/debian/patches/fixupcurl.patch	2011-09-05 16:07:29 UTC (rev 7674)
@@ -1,7 +1,21 @@
+Use system installed curl, instead of convenient copy
+Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 16:07:00.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 16:07:06.000000000 +0000
+@@ -12,7 +12,7 @@
+ #include "vtkHTTPHandler.h"
+ #include "vtkKWRemoteIOUtilities.h"
+ 
+-#include "Curl/curl/mprintf.h"
++#include "curl/mprintf.h"
+ 
+ vtkStandardNewMacro ( vtkHTTPHandler );
+ vtkCxxRevisionMacro ( vtkHTTPHandler, "$Revision: 1.10 $" );
 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
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx	2011-09-05 16:06:56.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx	2011-09-05 16:07:06.000000000 +0000
 @@ -13,7 +13,7 @@
  #include "vtkURIHandler.h"
  #include "vtkKWRemoteIOManager.h"
@@ -13,8 +27,8 @@
  // 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
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h	2011-09-05 16:06:56.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h	2011-09-05 16:07:06.000000000 +0000
 @@ -16,7 +16,7 @@
  #pragma warning ( disable : 4786 )
  #endif
@@ -24,4 +38,3 @@
  #include "vtkObjectFactory.h"
  #include <vtksys/SystemTools.hxx>
  #include <vtksys/Process.h>
-

Modified: trunk/packages/volview/trunk/debian/patches/fixuptar.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixuptar.patch	2011-09-05 16:03:21 UTC (rev 7673)
+++ trunk/packages/volview/trunk/debian/patches/fixuptar.patch	2011-09-05 16:07:29 UTC (rev 7674)
@@ -1,7 +1,9 @@
+VolView is using a special libtar library, not compatible with libtar-dev on debian
+remove tar functionalities for now
 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
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx	2011-09-05 16:02:26.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx	2011-09-05 16:04:23.000000000 +0000
 @@ -21,8 +21,8 @@
  #endif
  
@@ -55,4 +57,3 @@
    return 1;
  }
  
-

Modified: trunk/packages/volview/trunk/debian/patches/fixuptcl.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixuptcl.patch	2011-09-05 16:03:21 UTC (rev 7673)
+++ trunk/packages/volview/trunk/debian/patches/fixuptcl.patch	2011-09-05 16:07:29 UTC (rev 7674)
@@ -1,7 +1,8 @@
+Fix issues with using system install Tcl/Tk 8.5
 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
+--- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-05 16:02:26.000000000 +0000
++++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-05 16:04:13.000000000 +0000
 @@ -15,7 +15,9 @@
  ENDIF(COMMAND CMAKE_POLICY)
  
@@ -12,10 +13,11 @@
 +  )
  # --------------------------------------------------------------------------
  # 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
+--- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 16:03:28.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 16:04:13.000000000 +0000
 @@ -16,7 +16,10 @@
  
  
@@ -43,8 +45,8 @@
  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
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2011-09-05 16:03:28.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2011-09-05 16:04:13.000000000 +0000
 @@ -15,7 +15,9 @@
  ENDIF(COMMAND CMAKE_POLICY)

More information about the debian-med-commit mailing list