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

[Mathieu Malaterre]

Author: malat
Date: 2014-03-20 21:35:02 +0000 (Thu, 20 Mar 2014)
New Revision: 16492

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

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

Added: trunk/packages/vtk-dicom/trunk/debian/patches/vtk2.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/vtk2.patch	                        (rev 0)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/vtk2.patch	2014-03-20 21:35:02 UTC (rev 16492)
@@ -0,0 +1,48 @@
+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/Testing/CMakeLists.txt
++++ vtk-dicom-0.4.2/Testing/CMakeLists.txt
+@@ -1,5 +1,11 @@
+ include_directories(${DICOM_INCLUDE_DIRS})
+ 
++if("${VTK_MAJOR_VERSION}" GREATER 5)
++  set(VTK_LIBS vtkCommonCore) # VTK 6.x
++else()
++  set(VTK_LIBS vtkCommon) # VTK 5.x
++endif()
++
+ add_executable(TestDICOMDictionary TestDICOMDictionary.cxx)
+ target_link_libraries(TestDICOMDictionary vtkDICOM)
+ get_target_property(pth TestDICOMDictionary RUNTIME_OUTPUT_DIRECTORY)
+@@ -31,6 +37,6 @@ get_target_property(pth TestDICOMMetaDat
+ add_test(TestDICOMMetaData ${pth}/TestDICOMMetaData)
+ 
+ add_executable(TestDICOMCharacterSet TestDICOMCharacterSet.cxx)
+-target_link_libraries(TestDICOMCharacterSet vtkDICOM vtkCommonCore)
++target_link_libraries(TestDICOMCharacterSet vtkDICOM ${VTK_LIBS})
+ get_target_property(pth TestDICOMCharacterSet RUNTIME_OUTPUT_DIRECTORY)
+ add_test(TestDICOMCharacterSet ${pth}/TestDICOMCharacterSet)