[med-svn] r16493 - trunk/packages/vtk-dicom/trunk/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2014-03-20 21:44:42 +0000 (Thu, 20 Mar 2014)
New Revision: 16493

Added:
   trunk/packages/vtk-dicom/trunk/debian/patches/vtk3.patch
Modified:
   trunk/packages/vtk-dicom/trunk/debian/patches/series
Log:
more vtk fixes

Modified: trunk/packages/vtk-dicom/trunk/debian/patches/series
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/series	2014-03-20 21:35:02 UTC (rev 16492)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/series	2014-03-20 21:44:42 UTC (rev 16493)
@@ -4,3 +4,4 @@
 final.patch
 vtk.patch
 vtk2.patch
+vtk3.patch

Added: trunk/packages/vtk-dicom/trunk/debian/patches/vtk3.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/vtk3.patch	                        (rev 0)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/vtk3.patch	2014-03-20 21:44:42 UTC (rev 16493)
@@ -0,0 +1,71 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk-dicom (0.4.2-1) unstable; urgency=low
+ .
+   * Initial release. (Closes: #742217)
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/742217
+
+---
+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>
+
+--- vtk-dicom-0.4.2.orig/Examples/CMakeLists.txt
++++ vtk-dicom-0.4.2/Examples/CMakeLists.txt
+@@ -3,32 +3,34 @@ include_directories(${DICOM_INCLUDE_DIRS
+ if("${VTK_MAJOR_VERSION}" GREATER 5)
+   set(VTK_LIBS vtkRenderingImage vtkInteractionStyle
+       vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL) # VTK 6.x
++  set(VTK_LIBS2 vtkCommonCore) # VTK 6.x
+ else()
+   set(VTK_LIBS vtkRendering) # VTK 5.x
++  set(VTK_LIBS2 vtkCommon) # VTK 5.x
+ endif()
+ 
+ add_executable(TestDICOMCompiler TestDICOMCompiler.cxx)
+-target_link_libraries(TestDICOMCompiler vtkDICOM vtkCommonCore vtksys)
++target_link_libraries(TestDICOMCompiler vtkDICOM ${VTK_LIBS2} vtksys)
+ 
+ add_executable(TestDICOMDirectory TestDICOMDirectory.cxx)
+-target_link_libraries(TestDICOMDirectory vtkDICOM vtkCommonCore)
++target_link_libraries(TestDICOMDirectory vtkDICOM ${VTK_LIBS2})
+ 
+ add_executable(TestDICOMParser TestDICOMParser.cxx)
+-target_link_libraries(TestDICOMParser vtkDICOM vtkCommonCore)
++target_link_libraries(TestDICOMParser vtkDICOM ${VTK_LIBS2})
+ 
+ add_executable(TestDICOMSorter TestDICOMSorter.cxx)
+-target_link_libraries(TestDICOMSorter vtkDICOM vtkCommonCore)
++target_link_libraries(TestDICOMSorter vtkDICOM ${VTK_LIBS2})
+ 
+ add_executable(TestDICOMReader TestDICOMReader.cxx)
+-target_link_libraries(TestDICOMReader vtkDICOM vtkCommonCore vtkIOMPIImage) 
++target_link_libraries(TestDICOMReader vtkDICOM ${VTK_LIBS2}) #vtkIOMPIImage) 
+ 
+ add_executable(TestDICOMWriter TestDICOMWriter.cxx)
+-target_link_libraries(TestDICOMWriter vtkDICOM vtkIOMPIImage)
++target_link_libraries(TestDICOMWriter vtkDICOM ) #vtkIOMPIImage)
+ 
+ if(VTK_MAJOR_VERSION GREATER 5 OR VTK_MINOR_VERSION GREATER 9)
+ add_executable(TestDICOMDisplay TestDICOMDisplay.cxx)
+-target_link_libraries(TestDICOMDisplay vtkDICOM ${VTK_LIBS} vtkIOMPIImage)
++target_link_libraries(TestDICOMDisplay vtkDICOM ${VTK_LIBS}) # vtkIOMPIImage)
+ 
+ add_executable(TestNIFTIDisplay TestNIFTIDisplay.cxx)
+-target_link_libraries(TestNIFTIDisplay vtkDICOM ${VTK_LIBS} vtkIOMPIImage)
++target_link_libraries(TestNIFTIDisplay vtkDICOM ${VTK_LIBS}) # vtkIOMPIImage)
+ endif()