[med-svn] r7669 - in trunk/packages/volview/trunk/debian: . patches

Mathieu Malaterre malat-guest at alioth.debian.org
Mon Sep 5 15:24:46 UTC 2011


Author: malat-guest
Date: 2011-09-05 15:24:46 +0000 (Mon, 05 Sep 2011)
New Revision: 7669

Added:
   trunk/packages/volview/trunk/debian/doc-base.vv
   trunk/packages/volview/trunk/debian/patches/fixmath.patch
Removed:
   trunk/packages/volview/trunk/debian/patches/debian-changes-3.4-1
   trunk/packages/volview/trunk/debian/patches/fixmath.patch
Modified:
   trunk/packages/volview/trunk/debian/docs
   trunk/packages/volview/trunk/debian/patches/series
Log:
reshuffle patches

Added: trunk/packages/volview/trunk/debian/doc-base.vv
===================================================================
--- trunk/packages/volview/trunk/debian/doc-base.vv	                        (rev 0)
+++ trunk/packages/volview/trunk/debian/doc-base.vv	2011-09-05 15:24:46 UTC (rev 7669)
@@ -0,0 +1,21 @@
+Document: dicomscope
+Title: DICOM Conformance Statement
+Author: M. Eichelberg, K. Kleber, J. Riesmeier, A. Schröter, A. Thiel
+Abstract: The OFFIS DICOM Viewer
+ DICOMscope is a free DICOM viewer which can display uncompressed,
+ monochrome DICOM images from all modalities and which supports
+ monitor calibration according to DICOM part 14 as well as
+ presentation states. DICOMscope offers a print client (DICOM Basic
+ Grayscale Print Management) which also implements the optional
+ Presentation LUT SOP Class. The development of this prototype was
+ commissioned by the "Committee for the Advancement of DICOM" and
+ demonstrated at the European Congress of Radiology ECR 1999. An
+ enhanced version was developed for the "DICOM Display Consistency
+ Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has
+ been demonstrated at ECR 2001 and contains numerous extensions,
+ including a print server, support for encrypted DICOM communication,
+ digital signatures and structured reporting.
+Section: Science/Medicine
+
+Format: PDF
+Files: /usr/share/doc/dicomscope/dscs360.pdf

Modified: trunk/packages/volview/trunk/debian/docs
===================================================================
--- trunk/packages/volview/trunk/debian/docs	2011-09-05 15:10:48 UTC (rev 7668)
+++ trunk/packages/volview/trunk/debian/docs	2011-09-05 15:24:46 UTC (rev 7669)
@@ -1 +1 @@
-usr/doc/VolView*.pdf
+usr/doc/VolView\ 3\ User\ Manual.pdf usr/share/doc/volview/

Deleted: trunk/packages/volview/trunk/debian/patches/debian-changes-3.4-1
===================================================================
--- trunk/packages/volview/trunk/debian/patches/debian-changes-3.4-1	2011-09-05 15:10:48 UTC (rev 7668)
+++ trunk/packages/volview/trunk/debian/patches/debian-changes-3.4-1	2011-09-05 15:24:46 UTC (rev 7669)
@@ -1,51 +0,0 @@
-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 12:43:57.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 12:43:57.000000000 +0000
-@@ -3657,7 +3657,7 @@
-   if (this->VolumeMapper)
-     {
-     this->AddVolumeMapperProgress(
--      this->VolumeMapper,
-+      (vtkVolumeMapper*)this->VolumeMapper,
-       ks_("Progress|Generating Image"));
- 
-     this->AddVolumeMapperGradientProgress(
-Index: volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt	2011-09-05 13:02:19.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt	2011-09-05 13:04:13.000000000 +0000
-@@ -69,7 +69,7 @@
-   #vvITKMultimodalityRegistrationRigidJointHistogramPlotter
-   #vvITKLandmarkPreparation
-   #vvITKScalarImageKMeansClassifier
--  vvITKScalarKmeansMarkovRandomField
-+  #vvITKScalarKmeansMarkovRandomField
-   vvITKSigmoid
-   #vvITKShapeDetectionModule
-   #vvITKSurfaceSpline

Deleted: trunk/packages/volview/trunk/debian/patches/fixmath.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixmath.patch	2011-09-05 15:10:48 UTC (rev 7668)
+++ trunk/packages/volview/trunk/debian/patches/fixmath.patch	2011-09-05 15:24:46 UTC (rev 7669)
@@ -1,362 +0,0 @@
-Index: volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx	2011-09-05 13:15:01.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx	2011-09-05 13:15:08.000000000 +0000
-@@ -1070,7 +1070,7 @@
-     {
-     return;
-     }
--  double theta = vtkMath::DoubleRadiansToDegrees() * acos( dotproduct );
-+  double theta = 0; //vtkMath::DoubleRadiansToDegrees() * acos( dotproduct );
- 
-   // 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 13:29:24.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2011-09-05 13:29:45.000000000 +0000
-@@ -15,7 +15,9 @@
- ENDIF(COMMAND CMAKE_POLICY)
- 
- PROJECT(KWWidgetsPro)
--
-+include_directories(
-+  /usr/include/tcl8.5
-+)
- # --------------------------------------------------------------------------
- # 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 13:31:10.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx	2011-09-05 13:31:33.000000000 +0000
-@@ -59,8 +59,8 @@
-     atan2((double)rwi->GetLastEventPosition()[1] - (double)center[1],
-           (double)rwi->GetLastEventPosition()[0] - (double)center[0]);
-   
--  newAngle *= vtkMath::RadiansToDegrees();
--  oldAngle *= vtkMath::RadiansToDegrees();
-+  //newAngle *= vtkMath::RadiansToDegrees();
-+  //oldAngle *= vtkMath::RadiansToDegrees();
- 
-   widget->RollPlane(newAngle - oldAngle);
- }
-@@ -94,8 +94,8 @@
-   double rxf = (double)dx * delta_azimuth * motionFactor;
-   double ryf = (double)dy * delta_elevation * motionFactor;
- 
--  rxf *= vtkMath::RadiansToDegrees();
--  ryf *= vtkMath::RadiansToDegrees();
-+  //rxf *= vtkMath::RadiansToDegrees();
-+  //ryf *= vtkMath::RadiansToDegrees();
-   
-   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 13:53:41.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 15:04:04.000000000 +0000
-@@ -16,7 +16,10 @@
- 
- 
- PROJECT(KWVolView)
--
-+include_directories(
-+  /usr/include/tcl8.5
-+  /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 14:10:55.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx	2011-09-05 14:11:17.000000000 +0000
-@@ -196,6 +196,7 @@
-     {
-     quiet = appPro->GetTestingMode();
-     }
--  return this->Superclass::SaveScreenshotAllWidgetsToFile( filename, quiet );
-+  //return this->Superclass::SaveScreenshotAllWidgetsToFile( filename, quiet );
-+  return 0;
- }
- 
-Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx	2011-09-05 13:31:58.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx	2011-09-05 13:32:05.000000000 +0000
-@@ -584,7 +584,7 @@
-     return;
-     }
-   double cos_theta = vtkMath::Dot(oldz, z);
--  double theta = acos( cos_theta )*vtkMath::DoubleRadiansToDegrees();
-+  double theta = 0; //acos( cos_theta )*vtkMath::DoubleRadiansToDegrees();
-   this->Transform->Identity();
-   this->Transform->Translate(origin[0],origin[1],origin[2]);
-   this->Transform->RotateWXYZ(theta,axis);
-Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 13:32:49.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 13:33:02.000000000 +0000
-@@ -3740,8 +3740,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/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h	2011-09-05 14:41:00.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h	2011-09-05 14:41:14.000000000 +0000
-@@ -43,7 +43,7 @@
-     VolumeMapper        = vtkSmartPointer< vtkPolyDataMapper >::New();
-     ObliqueMapper       = vtkSmartPointer< vtkPolyDataMapper >::New();
-     ObliquePlaneCutter  = vtkSmartPointer< vtkCutter >::New();
--    ObliquePlane        = vtkSmartPointer< vtkCutter >::New();
-+    ObliquePlane        = vtkSmartPointer< vtkPlane >::New();
-     VolumeMapper->ScalarVisibilityOff();
-     ObliqueMapper->ScalarVisibilityOff();
-     ObliqueMapper->SetResolveCoincidentTopologyToPolygonOffset();
-Index: volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx	2011-09-05 14:41:37.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx	2011-09-05 14:42:02.000000000 +0000
-@@ -364,9 +364,9 @@
-       this->SupportsCompression( strategy ))
-     {
-     writer->SetCompression(true);
--    writer->SetCompressionTypeToJPEG2000();
--    writer->SetJPEG2000CompressionRatio( this->CompressionRatio );
--    writer->SetJPEG2000UseIrreversibleKernel(0);
-+    //writer->SetCompressionTypeToJPEG2000();
-+    //writer->SetJPEG2000CompressionRatio( this->CompressionRatio );
-+    //writer->SetJPEG2000UseIrreversibleKernel(0);
-     statusString = "Compressing using JPEG2000 ..";
-     }
- 
-@@ -375,7 +375,7 @@
-     {
-     // Deflate stream is written out as a single file.
-     writer->SetCompression(true);
--    writer->SetCompressionTypeToDeflate();
-+    //writer->SetCompressionTypeToDeflate();
-     statusString = "Compressing using Deflate ..";
-     }
- 
-Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx	2011-09-05 14:44:27.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx	2011-09-05 14:44:39.000000000 +0000
-@@ -532,7 +532,7 @@
-   this->VolumePropertyPresetSelector->FilterButtonVisibilityOn();
-   this->VolumePropertyPresetSelector->LocateButtonVisibilityOn();
-   this->VolumePropertyPresetSelector->EmailButtonVisibilityOn();
--  this->VolumePropertyPresetSelector->RemovePresetAlsoRemoveFileOn();
-+  //this->VolumePropertyPresetSelector->RemovePresetAlsoRemoveFileOn();
-   this->VolumePropertyPresetSelector->SetPresetAddCommand(
-     this, "VolumePropertyPresetAddCallback");
-   this->VolumePropertyPresetSelector->SetPresetUpdateCommand(
-@@ -607,7 +607,7 @@
-   this->WindowLevelPresetSelector->ThumbnailColumnVisibilityOn();
-   this->WindowLevelPresetSelector->LocateButtonVisibilityOn();
-   this->WindowLevelPresetSelector->EmailButtonVisibilityOn();
--  this->WindowLevelPresetSelector->RemovePresetAlsoRemoveFileOn();
-+  //this->WindowLevelPresetSelector->RemovePresetAlsoRemoveFileOn();
-   this->WindowLevelPresetSelector->SetPresetAddCommand(
-     this, "WindowLevelPresetAddCallback");
-   this->WindowLevelPresetSelector->SetPresetUpdateCommand(
-Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx	2011-09-05 14:45:03.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx	2011-09-05 14:45:18.000000000 +0000
-@@ -682,10 +682,10 @@
-     list->FindAndDeleteRow(0, labels->GetDirectionCosineLabel());
-     }
- 
--  if (med_prop && med_prop->GetTableHeight())
-+  if (med_prop /*&& med_prop->GetTableHeight()*/)
-     {
--    list->FindAndInsertCellText(0, labels->GetTableHeightLabel(), 
--                                1, med_prop->GetTableHeight());
-+//    list->FindAndInsertCellText(0, labels->GetTableHeightLabel(), 
-+//                                1, med_prop->GetTableHeight());
-     }
-   else
-     {
-Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx	2011-09-05 14:43:44.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx	2011-09-05 14:43:56.000000000 +0000
-@@ -196,8 +196,8 @@
-   this->UndoStrokeButton->SetText("Undo stroke");
-   this->UndoStrokeButton->SetBalloonHelpString(
-     "Undo the last draw/erase stroke");
--  this->UndoStrokeButton->SetImageToPredefinedIcon(
--    vtkKWIcon::IconSilkArrowUndo);
-+  //this->UndoStrokeButton->SetImageToPredefinedIcon(
-+  //  vtkKWIcon::IconSilkArrowUndo);
-   this->AddWidget(this->UndoStrokeButton);
- 
-   // Redo
-@@ -208,8 +208,8 @@
-   this->RedoStrokeButton->SetText("Redo stroke");
-   this->RedoStrokeButton->SetBalloonHelpString(
-     "Redo the last draw/erase stroke");
--  this->RedoStrokeButton->SetImageToPredefinedIcon(
--    vtkKWIcon::IconSilkArrowRedo);
-+  //this->RedoStrokeButton->SetImageToPredefinedIcon(
-+  //  vtkKWIcon::IconSilkArrowRedo);
-   this->AddWidget(this->RedoStrokeButton);
-    
-   if (use_sep)
-@@ -438,4 +438,4 @@
- {
-   this->Superclass::PrintSelf(os,indent);
-   os << indent << "SupportMultiSketchOperations: " << (this->GetSupportMultiSketchOperations() ? "on":"off") << endl;
--}
-\ No newline at end of file
-+}
-Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx	2011-09-05 14:42:44.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx	2011-09-05 14:42:52.000000000 +0000
-@@ -598,8 +598,8 @@
-     this->PopulateInteractorWidgets();
-     this->InteractorWidgetSelector->Update();
-     this->InteractorWidgetSelector->SetEnabled(data ? this->GetEnabled() : 0);
--    this->InteractorWidgetPropertiesUpdatedCallback(
--      this->InteractorWidgetSelector->GetIdOfVisibleSelectedPreset());
-+    //this->InteractorWidgetPropertiesUpdatedCallback(
-+    //  this->InteractorWidgetSelector->GetIdOfVisibleSelectedPreset());
-     }
- }
- 
-Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 14:46:33.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 14:46:37.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/vtkHTTPHandler.h
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h	2011-09-05 14:46:08.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h	2011-09-05 14:46:12.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 14:46:21.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx	2011-09-05 14:46:25.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 14:47:58.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx	2011-09-05 14:54:17.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 14:56:52.000000000 +0000
-+++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-05 14:58:55.000000000 +0000
-@@ -15,7 +15,9 @@
- ENDIF(COMMAND CMAKE_POLICY)
- 
- PROJECT(VolView)
--
-+include_directories(
-+  ${TCL_INCLUDE_PATH}
-+  )
- # --------------------------------------------------------------------------
- # We need VolViewLibraries
- 

Copied: trunk/packages/volview/trunk/debian/patches/fixmath.patch (from rev 7665, trunk/packages/volview/trunk/debian/patches/debian-changes-3.4-1)
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixmath.patch	                        (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/fixmath.patch	2011-09-05 15:24:46 UTC (rev 7669)
@@ -0,0 +1,413 @@
+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 12:43:57.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 12:43:57.000000000 +0000
+@@ -3657,7 +3657,7 @@
+   if (this->VolumeMapper)
+     {
+     this->AddVolumeMapperProgress(
+-      this->VolumeMapper,
++      (vtkVolumeMapper*)this->VolumeMapper,
+       ks_("Progress|Generating Image"));
+ 
+     this->AddVolumeMapperGradientProgress(
+Index: volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt	2011-09-05 13:02:19.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt	2011-09-05 13:04:13.000000000 +0000
+@@ -69,7 +69,7 @@
+   #vvITKMultimodalityRegistrationRigidJointHistogramPlotter
+   #vvITKLandmarkPreparation
+   #vvITKScalarImageKMeansClassifier
+-  vvITKScalarKmeansMarkovRandomField
++  #vvITKScalarKmeansMarkovRandomField
+   vvITKSigmoid
+   #vvITKShapeDetectionModule
+   #vvITKSurfaceSpline
+Index: volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx	2011-09-05 13:15:01.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx	2011-09-05 13:15:08.000000000 +0000
+@@ -1070,7 +1070,7 @@
+     {
+     return;
+     }
+-  double theta = vtkMath::DoubleRadiansToDegrees() * acos( dotproduct );
++  double theta = 0; //vtkMath::DoubleRadiansToDegrees() * acos( dotproduct );
+ 
+   // 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 13:29:24.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2011-09-05 13:29:45.000000000 +0000
+@@ -15,7 +15,9 @@
+ ENDIF(COMMAND CMAKE_POLICY)
+ 
+ PROJECT(KWWidgetsPro)
+-
++include_directories(
++  /usr/include/tcl8.5
++)
+ # --------------------------------------------------------------------------
+ # 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 13:31:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx	2011-09-05 13:31:33.000000000 +0000
+@@ -59,8 +59,8 @@
+     atan2((double)rwi->GetLastEventPosition()[1] - (double)center[1],
+           (double)rwi->GetLastEventPosition()[0] - (double)center[0]);
+   
+-  newAngle *= vtkMath::RadiansToDegrees();
+-  oldAngle *= vtkMath::RadiansToDegrees();
++  //newAngle *= vtkMath::RadiansToDegrees();
++  //oldAngle *= vtkMath::RadiansToDegrees();
+ 
+   widget->RollPlane(newAngle - oldAngle);
+ }
+@@ -94,8 +94,8 @@
+   double rxf = (double)dx * delta_azimuth * motionFactor;
+   double ryf = (double)dy * delta_elevation * motionFactor;
+ 
+-  rxf *= vtkMath::RadiansToDegrees();
+-  ryf *= vtkMath::RadiansToDegrees();
++  //rxf *= vtkMath::RadiansToDegrees();
++  //ryf *= vtkMath::RadiansToDegrees();
+   
+   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 13:53:41.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 15:04:04.000000000 +0000
+@@ -16,7 +16,10 @@
+ 
+ 
+ PROJECT(KWVolView)
+-
++include_directories(
++  /usr/include/tcl8.5
++  /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 14:10:55.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx	2011-09-05 14:11:17.000000000 +0000
+@@ -196,6 +196,7 @@
+     {
+     quiet = appPro->GetTestingMode();
+     }
+-  return this->Superclass::SaveScreenshotAllWidgetsToFile( filename, quiet );
++  //return this->Superclass::SaveScreenshotAllWidgetsToFile( filename, quiet );
++  return 0;
+ }
+ 
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx	2011-09-05 13:31:58.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx	2011-09-05 13:32:05.000000000 +0000
+@@ -584,7 +584,7 @@
+     return;
+     }
+   double cos_theta = vtkMath::Dot(oldz, z);
+-  double theta = acos( cos_theta )*vtkMath::DoubleRadiansToDegrees();
++  double theta = 0; //acos( cos_theta )*vtkMath::DoubleRadiansToDegrees();
+   this->Transform->Identity();
+   this->Transform->Translate(origin[0],origin[1],origin[2]);
+   this->Transform->RotateWXYZ(theta,axis);
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 13:32:49.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx	2011-09-05 13:33:02.000000000 +0000
+@@ -3740,8 +3740,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/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h	2011-09-05 14:41:00.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h	2011-09-05 14:41:14.000000000 +0000
+@@ -43,7 +43,7 @@
+     VolumeMapper        = vtkSmartPointer< vtkPolyDataMapper >::New();
+     ObliqueMapper       = vtkSmartPointer< vtkPolyDataMapper >::New();
+     ObliquePlaneCutter  = vtkSmartPointer< vtkCutter >::New();
+-    ObliquePlane        = vtkSmartPointer< vtkCutter >::New();
++    ObliquePlane        = vtkSmartPointer< vtkPlane >::New();
+     VolumeMapper->ScalarVisibilityOff();
+     ObliqueMapper->ScalarVisibilityOff();
+     ObliqueMapper->SetResolveCoincidentTopologyToPolygonOffset();
+Index: volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx	2011-09-05 14:41:37.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx	2011-09-05 14:42:02.000000000 +0000
+@@ -364,9 +364,9 @@
+       this->SupportsCompression( strategy ))
+     {
+     writer->SetCompression(true);
+-    writer->SetCompressionTypeToJPEG2000();
+-    writer->SetJPEG2000CompressionRatio( this->CompressionRatio );
+-    writer->SetJPEG2000UseIrreversibleKernel(0);
++    //writer->SetCompressionTypeToJPEG2000();
++    //writer->SetJPEG2000CompressionRatio( this->CompressionRatio );
++    //writer->SetJPEG2000UseIrreversibleKernel(0);
+     statusString = "Compressing using JPEG2000 ..";
+     }
+ 
+@@ -375,7 +375,7 @@
+     {
+     // Deflate stream is written out as a single file.
+     writer->SetCompression(true);
+-    writer->SetCompressionTypeToDeflate();
++    //writer->SetCompressionTypeToDeflate();
+     statusString = "Compressing using Deflate ..";
+     }
+ 
+Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx	2011-09-05 14:44:27.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx	2011-09-05 14:44:39.000000000 +0000
+@@ -532,7 +532,7 @@
+   this->VolumePropertyPresetSelector->FilterButtonVisibilityOn();
+   this->VolumePropertyPresetSelector->LocateButtonVisibilityOn();
+   this->VolumePropertyPresetSelector->EmailButtonVisibilityOn();
+-  this->VolumePropertyPresetSelector->RemovePresetAlsoRemoveFileOn();
++  //this->VolumePropertyPresetSelector->RemovePresetAlsoRemoveFileOn();
+   this->VolumePropertyPresetSelector->SetPresetAddCommand(
+     this, "VolumePropertyPresetAddCallback");
+   this->VolumePropertyPresetSelector->SetPresetUpdateCommand(
+@@ -607,7 +607,7 @@
+   this->WindowLevelPresetSelector->ThumbnailColumnVisibilityOn();
+   this->WindowLevelPresetSelector->LocateButtonVisibilityOn();
+   this->WindowLevelPresetSelector->EmailButtonVisibilityOn();
+-  this->WindowLevelPresetSelector->RemovePresetAlsoRemoveFileOn();
++  //this->WindowLevelPresetSelector->RemovePresetAlsoRemoveFileOn();
+   this->WindowLevelPresetSelector->SetPresetAddCommand(
+     this, "WindowLevelPresetAddCallback");
+   this->WindowLevelPresetSelector->SetPresetUpdateCommand(
+Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx	2011-09-05 14:45:03.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx	2011-09-05 14:45:18.000000000 +0000
+@@ -682,10 +682,10 @@
+     list->FindAndDeleteRow(0, labels->GetDirectionCosineLabel());
+     }
+ 
+-  if (med_prop && med_prop->GetTableHeight())
++  if (med_prop /*&& med_prop->GetTableHeight()*/)
+     {
+-    list->FindAndInsertCellText(0, labels->GetTableHeightLabel(), 
+-                                1, med_prop->GetTableHeight());
++//    list->FindAndInsertCellText(0, labels->GetTableHeightLabel(), 
++//                                1, med_prop->GetTableHeight());
+     }
+   else
+     {
+Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx	2011-09-05 14:43:44.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx	2011-09-05 14:43:56.000000000 +0000
+@@ -196,8 +196,8 @@
+   this->UndoStrokeButton->SetText("Undo stroke");
+   this->UndoStrokeButton->SetBalloonHelpString(
+     "Undo the last draw/erase stroke");
+-  this->UndoStrokeButton->SetImageToPredefinedIcon(
+-    vtkKWIcon::IconSilkArrowUndo);
++  //this->UndoStrokeButton->SetImageToPredefinedIcon(
++  //  vtkKWIcon::IconSilkArrowUndo);
+   this->AddWidget(this->UndoStrokeButton);
+ 
+   // Redo
+@@ -208,8 +208,8 @@
+   this->RedoStrokeButton->SetText("Redo stroke");
+   this->RedoStrokeButton->SetBalloonHelpString(
+     "Redo the last draw/erase stroke");
+-  this->RedoStrokeButton->SetImageToPredefinedIcon(
+-    vtkKWIcon::IconSilkArrowRedo);
++  //this->RedoStrokeButton->SetImageToPredefinedIcon(
++  //  vtkKWIcon::IconSilkArrowRedo);
+   this->AddWidget(this->RedoStrokeButton);
+    
+   if (use_sep)
+@@ -438,4 +438,4 @@
+ {
+   this->Superclass::PrintSelf(os,indent);
+   os << indent << "SupportMultiSketchOperations: " << (this->GetSupportMultiSketchOperations() ? "on":"off") << endl;
+-}
+\ No newline at end of file
++}
+Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx	2011-09-05 14:42:44.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx	2011-09-05 14:42:52.000000000 +0000
+@@ -598,8 +598,8 @@
+     this->PopulateInteractorWidgets();
+     this->InteractorWidgetSelector->Update();
+     this->InteractorWidgetSelector->SetEnabled(data ? this->GetEnabled() : 0);
+-    this->InteractorWidgetPropertiesUpdatedCallback(
+-      this->InteractorWidgetSelector->GetIdOfVisibleSelectedPreset());
++    //this->InteractorWidgetPropertiesUpdatedCallback(
++    //  this->InteractorWidgetSelector->GetIdOfVisibleSelectedPreset());
+     }
+ }
+ 
+Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 14:46:33.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 14:46:37.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/vtkHTTPHandler.h
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h	2011-09-05 14:46:08.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h	2011-09-05 14:46:12.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 14:46:21.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx	2011-09-05 14:46:25.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 14:47:58.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx	2011-09-05 14:54:17.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 14:56:52.000000000 +0000
++++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-05 14:58:55.000000000 +0000
+@@ -15,7 +15,9 @@
+ ENDIF(COMMAND CMAKE_POLICY)
+ 
+ PROJECT(VolView)
+-
++include_directories(
++  ${TCL_INCLUDE_PATH}
++  )
+ # --------------------------------------------------------------------------
+ # We need VolViewLibraries
+ 

Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series	2011-09-05 15:10:48 UTC (rev 7668)
+++ trunk/packages/volview/trunk/debian/patches/series	2011-09-05 15:24:46 UTC (rev 7669)
@@ -3,5 +3,4 @@
 fixupvtkedge.patch
 fixslcreader.patch
 fixcompissues.patch
-debian-changes-3.4-1
 fixmath.patch




More information about the debian-med-commit mailing list