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

Mathieu Malaterre malat at moszumanska.debian.org
Mon Mar 24 11:32:27 UTC 2014 

Author: malat
Date: 2014-03-24 11:32:27 +0000 (Mon, 24 Mar 2014)
New Revision: 16509

Removed:
   trunk/packages/vtk-dicom/trunk/debian/patches/final.patch
   trunk/packages/vtk-dicom/trunk/debian/patches/fixcomp.patch
   trunk/packages/vtk-dicom/trunk/debian/patches/lib.patch
   trunk/packages/vtk-dicom/trunk/debian/patches/vtk.patch
   trunk/packages/vtk-dicom/trunk/debian/patches/vtk2.patch
   trunk/packages/vtk-dicom/trunk/debian/patches/vtk3.patch
   trunk/packages/vtk-dicom/trunk/debian/patches/vtk4.patch
Modified:
   trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch
   trunk/packages/vtk-dicom/trunk/debian/patches/series
Log:
merge all

Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/final.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/final.patch	2014-03-24 11:31:04 UTC (rev 16508)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/final.patch	2014-03-24 11:32:27 UTC (rev 16509)
@@ -1,37 +0,0 @@
-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/CMakeLists.txt
-+++ vtk-dicom-0.4.2/CMakeLists.txt
-@@ -123,7 +123,7 @@ set(DICOM_BIN_DIR "/bin") # for executab
- set(DICOM_ARC_DIR "/lib") # for static or ".lib" libraries
- set(DICOM_INC_DIR "/include") # for header files
- set(DICOM_DATA_DIR "/share/dicom-${DICOM_SHORT_VERSION}")
--set(DICOM_CMAKE_DIR "/lib/dicom-${DICOM_SHORT_VERSION}/cmake")
-+set(DICOM_CMAKE_DIR "${DICOM_LIB_DIR}/dicom-${DICOM_SHORT_VERSION}/cmake")
- 
- # Set the full paths to the install tree
- set(DICOM_RUNTIME_INSTALL_DEST ${CMAKE_INSTALL_PREFIX}${DICOM_BIN_DIR})

Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/fixcomp.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/fixcomp.patch	2014-03-24 11:31:04 UTC (rev 16508)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/fixcomp.patch	2014-03-24 11:32:27 UTC (rev 16509)
@@ -1,39 +0,0 @@
-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: #)
-Author: Mathieu Malaterre <malat at debian.org>
-
----
-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/CMakeLists.txt
-+++ vtk-dicom-0.4.2/CMakeLists.txt
-@@ -153,9 +153,9 @@ set(LIB_NAME vtkDICOM)
- 
- # The library dependencies
- if("${VTK_MAJOR_VERSION}" GREATER 5)
--  set(VTK_LIBS vtkIOImage vtksys vtkzlib) # VTK 6.x
-+  set(VTK_LIBS vtkIOMPIImage vtkIOImage vtksys ) # VTK 6.x
- else()
--  set(VTK_LIBS vtkIO vtksys vtkzlib) # VTK 5.x
-+  set(VTK_LIBS vtkIO vtksys ) # VTK 5.x
- endif()
- 
- if(WIN32)

Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/lib.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/lib.patch	2014-03-24 11:31:04 UTC (rev 16508)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/lib.patch	2014-03-24 11:32:27 UTC (rev 16509)
@@ -1,37 +0,0 @@
-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/CMakeLists.txt
-+++ vtk-dicom-0.4.2/CMakeLists.txt
-@@ -119,7 +119,7 @@ endif()
- 
- # Set up our target directory structure for "make install"
- set(DICOM_BIN_DIR "/bin") # for executables and ".dll" libraries
--set(DICOM_LIB_DIR "/lib") # for unix/linux/osx shared libraries
-+#set(DICOM_LIB_DIR "/lib") # for unix/linux/osx shared libraries
- set(DICOM_ARC_DIR "/lib") # for static or ".lib" libraries
- set(DICOM_INC_DIR "/include") # for header files
- set(DICOM_DATA_DIR "/share/dicom-${DICOM_SHORT_VERSION}")

Modified: trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch	2014-03-24 11:31:04 UTC (rev 16508)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch	2014-03-24 11:32:27 UTC (rev 16509)
@@ -26,73 +26,95 @@
 
 Index: vtk-dicom-0.4.3/Examples/CMakeLists.txt
 ===================================================================
---- vtk-dicom-0.4.3.orig/Examples/CMakeLists.txt	2014-03-24 12:02:18.291228095 +0100
-+++ vtk-dicom-0.4.3/Examples/CMakeLists.txt	2014-03-24 12:03:35.715193654 +0100
-@@ -8,27 +8,27 @@
+--- vtk-dicom-0.4.3.orig/Examples/CMakeLists.txt	2014-03-24 12:24:54.702069811 +0100
++++ vtk-dicom-0.4.3/Examples/CMakeLists.txt	2014-03-24 12:25:24.858070379 +0100
+@@ -3,32 +3,34 @@
+ 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 vtkFiltering) # VTK 5.x
  endif()
  
  add_executable(TestDICOMCompiler TestDICOMCompiler.cxx)
 -target_link_libraries(TestDICOMCompiler vtkDICOM)
-+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)
-+target_link_libraries(TestDICOMDirectory vtkDICOM vtkCommonCore)
++target_link_libraries(TestDICOMDirectory vtkDICOM ${VTK_LIBS2})
  
  add_executable(TestDICOMParser TestDICOMParser.cxx)
 -target_link_libraries(TestDICOMParser vtkDICOM)
-+target_link_libraries(TestDICOMParser vtkDICOM vtkCommonCore)
++target_link_libraries(TestDICOMParser vtkDICOM ${VTK_LIBS2})
  
  add_executable(TestDICOMSorter TestDICOMSorter.cxx)
 -target_link_libraries(TestDICOMSorter vtkDICOM)
-+target_link_libraries(TestDICOMSorter vtkDICOM vtkCommonCore)
++target_link_libraries(TestDICOMSorter vtkDICOM ${VTK_LIBS2})
  
  add_executable(TestDICOMReader TestDICOMReader.cxx)
 -target_link_libraries(TestDICOMReader vtkDICOM)
-+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)
-+target_link_libraries(TestDICOMWriter vtkDICOM vtkIOMPIImage)
++target_link_libraries(TestDICOMWriter vtkDICOM ${VTK_LIBS2} ) #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})
-+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})
-+target_link_libraries(TestNIFTIDisplay vtkDICOM ${VTK_LIBS} vtkIOMPIImage)
++target_link_libraries(TestNIFTIDisplay vtkDICOM ${VTK_LIBS}) # vtkIOMPIImage)
  endif()
 Index: vtk-dicom-0.4.3/Programs/CMakeLists.txt
 ===================================================================
---- vtk-dicom-0.4.3.orig/Programs/CMakeLists.txt	2014-03-24 12:02:18.291228095 +0100
-+++ vtk-dicom-0.4.3/Programs/CMakeLists.txt	2014-03-24 12:03:35.715193654 +0100
-@@ -8,7 +8,7 @@
+--- vtk-dicom-0.4.3.orig/Programs/CMakeLists.txt	2014-03-24 12:24:54.702069811 +0100
++++ vtk-dicom-0.4.3/Programs/CMakeLists.txt	2014-03-24 12:25:24.858070379 +0100
+@@ -8,9 +8,9 @@
  )
  
  if("${VTK_MAJOR_VERSION}" GREATER 5)
 -  set(VTK_LIBS vtkImagingStatistics) # VTK 6.x
 +  set(VTK_LIBS vtkIOImage vtkCommonCore vtkIOMPIImage vtkImagingStatistics) # VTK 6.x
  else()
-   set(VTK_LIBS vtkImaging) # VTK 5.x
+-  set(VTK_LIBS vtkImaging) # VTK 5.x
++  set(VTK_LIBS vtkIO vtkImaging) # VTK 5.x
  endif()
+ 
+ foreach(src ${PROGRAM_SRCS})
 Index: vtk-dicom-0.4.3/Testing/CMakeLists.txt
 ===================================================================
---- vtk-dicom-0.4.3.orig/Testing/CMakeLists.txt	2014-03-24 12:02:18.291228095 +0100
-+++ vtk-dicom-0.4.3/Testing/CMakeLists.txt	2014-03-24 12:03:35.715193654 +0100
-@@ -31,6 +31,6 @@
+--- vtk-dicom-0.4.3.orig/Testing/CMakeLists.txt	2014-03-24 12:24:54.702069811 +0100
++++ vtk-dicom-0.4.3/Testing/CMakeLists.txt	2014-03-24 12:25:24.858070379 +0100
+@@ -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 @@
  add_test(TestDICOMMetaData ${pth}/TestDICOMMetaData)
  
  add_executable(TestDICOMCharacterSet TestDICOMCharacterSet.cxx)
 -target_link_libraries(TestDICOMCharacterSet vtkDICOM)
-+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)
 Index: vtk-dicom-0.4.3/CMakeLists.txt
 ===================================================================
---- vtk-dicom-0.4.3.orig/CMakeLists.txt	2014-03-24 12:02:18.291228095 +0100
-+++ vtk-dicom-0.4.3/CMakeLists.txt	2014-03-24 12:03:56.963184459 +0100
+--- vtk-dicom-0.4.3.orig/CMakeLists.txt	2014-03-24 12:24:54.702069811 +0100
++++ vtk-dicom-0.4.3/CMakeLists.txt	2014-03-24 12:25:24.858070379 +0100
 @@ -292,6 +292,7 @@
  add_library(${LIB_NAME} ${LIB_SRCS} ${LIB_HIERARCHY_STAMP})
  set_target_properties(${LIB_NAME} PROPERTIES

Modified: trunk/packages/vtk-dicom/trunk/debian/patches/series
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/series	2014-03-24 11:31:04 UTC (rev 16508)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/series	2014-03-24 11:32:27 UTC (rev 16509)
@@ -1,5 +1 @@
 missingstuff.patch
-vtk.patch
-vtk2.patch
-vtk3.patch
-vtk4.patch

Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/vtk.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/vtk.patch	2014-03-24 11:31:04 UTC (rev 16508)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/vtk.patch	2014-03-24 11:32:27 UTC (rev 16509)
@@ -1,39 +0,0 @@
-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>
-
-Index: vtk-dicom-0.4.3/Programs/CMakeLists.txt
-===================================================================
---- vtk-dicom-0.4.3.orig/Programs/CMakeLists.txt	2014-03-24 12:01:41.379245027 +0100
-+++ vtk-dicom-0.4.3/Programs/CMakeLists.txt	2014-03-24 12:02:02.667235222 +0100
-@@ -10,7 +10,7 @@
- if("${VTK_MAJOR_VERSION}" GREATER 5)
-   set(VTK_LIBS vtkIOImage vtkCommonCore vtkIOMPIImage vtkImagingStatistics) # VTK 6.x
- else()
--  set(VTK_LIBS vtkImaging) # VTK 5.x
-+  set(VTK_LIBS vtkIO vtkImaging) # VTK 5.x
- endif()
- 
- foreach(src ${PROGRAM_SRCS})

Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/vtk2.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/vtk2.patch	2014-03-24 11:31:04 UTC (rev 16508)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/vtk2.patch	2014-03-24 11:32:27 UTC (rev 16509)
@@ -1,48 +0,0 @@
-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)

Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/vtk3.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/vtk3.patch	2014-03-24 11:31:04 UTC (rev 16508)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/vtk3.patch	2014-03-24 11:32:27 UTC (rev 16509)
@@ -1,71 +0,0 @@
-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()

Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/vtk4.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/vtk4.patch	2014-03-24 11:31:04 UTC (rev 16508)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/vtk4.patch	2014-03-24 11:32:27 UTC (rev 16509)
@@ -1,37 +0,0 @@
-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
-@@ -25,7 +25,7 @@ add_executable(TestDICOMReader TestDICOM
- target_link_libraries(TestDICOMReader vtkDICOM ${VTK_LIBS2}) #vtkIOMPIImage) 
- 
- add_executable(TestDICOMWriter TestDICOMWriter.cxx)
--target_link_libraries(TestDICOMWriter vtkDICOM ) #vtkIOMPIImage)
-+target_link_libraries(TestDICOMWriter vtkDICOM ${VTK_LIBS2} ) #vtkIOMPIImage)
- 
- if(VTK_MAJOR_VERSION GREATER 5 OR VTK_MINOR_VERSION GREATER 9)
- add_executable(TestDICOMDisplay TestDICOMDisplay.cxx)

More information about the debian-med-commit mailing list