[med-svn] r16506 - in trunk/packages/vtk-dicom/trunk/debian: . patches

[Mathieu Malaterre]

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

Modified:
   trunk/packages/vtk-dicom/trunk/debian/changelog
   trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch
   trunk/packages/vtk-dicom/trunk/debian/patches/series
   trunk/packages/vtk-dicom/trunk/debian/patches/vtk.patch
Log:
Update to latest release

Modified: trunk/packages/vtk-dicom/trunk/debian/changelog
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/changelog	2014-03-24 10:13:56 UTC (rev 16505)
+++ trunk/packages/vtk-dicom/trunk/debian/changelog	2014-03-24 11:04:27 UTC (rev 16506)
@@ -1,5 +1,5 @@
-vtk-dicom (0.4.2-1) experimental; urgency=low
+vtk-dicom (0.4.3-1) experimental; urgency=low
 
   * Initial release. (Closes: #742217)
 
- -- Mathieu Malaterre <malat at debian.org>  Thu, 20 Mar 2014 20:53:57 +0100
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 24 Mar 2014 12:01:00 +0100

Modified: trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch	2014-03-24 10:13:56 UTC (rev 16505)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/missingstuff.patch	2014-03-24 11:04:27 UTC (rev 16506)
@@ -24,20 +24,11 @@
 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
-@@ -259,6 +259,8 @@ endif()
- # Create the library
- add_library(${LIB_NAME} ${LIB_SRCS} ${LIB_HIERARCHY_STAMP})
- target_link_libraries(${LIB_NAME} ${VTK_LIBS} ${GDCM_LIBS} ${DCMTK_LIBS})
-+set(LIBRARY_PROPERTIES VERSION "${DICOM_VERSION}" SOVERSION "${DICOM_SHORT_VERSION}")
-+set_target_properties(${LIB_NAME} PROPERTIES ${LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "")
- set(DICOM_LIBRARIES ${LIB_NAME})
- 
- # Wrappers
---- vtk-dicom-0.4.2.orig/Examples/CMakeLists.txt
-+++ vtk-dicom-0.4.2/Examples/CMakeLists.txt
-@@ -8,27 +8,27 @@ else()
+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 @@
  endif()
  
  add_executable(TestDICOMCompiler TestDICOMCompiler.cxx)
@@ -73,9 +64,11 @@
 -target_link_libraries(TestNIFTIDisplay vtkDICOM ${VTK_LIBS})
 +target_link_libraries(TestNIFTIDisplay vtkDICOM ${VTK_LIBS} vtkIOMPIImage)
  endif()
---- vtk-dicom-0.4.2.orig/Programs/CMakeLists.txt
-+++ vtk-dicom-0.4.2/Programs/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(PROGRAM_SRCS
+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 @@
  )
  
  if("${VTK_MAJOR_VERSION}" GREATER 5)
@@ -84,9 +77,11 @@
  else()
    set(VTK_LIBS vtkImaging) # VTK 5.x
  endif()
---- vtk-dicom-0.4.2.orig/Testing/CMakeLists.txt
-+++ vtk-dicom-0.4.2/Testing/CMakeLists.txt
-@@ -31,6 +31,6 @@ get_target_property(pth TestDICOMMetaDat
+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 @@
  add_test(TestDICOMMetaData ${pth}/TestDICOMMetaData)
  
  add_executable(TestDICOMCharacterSet TestDICOMCharacterSet.cxx)
@@ -94,3 +89,15 @@
 +target_link_libraries(TestDICOMCharacterSet vtkDICOM vtkCommonCore)
  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
+@@ -292,6 +292,7 @@
+ add_library(${LIB_NAME} ${LIB_SRCS} ${LIB_HIERARCHY_STAMP})
+ set_target_properties(${LIB_NAME} PROPERTIES
+   VERSION "${DICOM_VERSION}" SOVERSION "${DICOM_SHORT_VERSION}")
++set_target_properties(${LIB_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ target_link_libraries(${LIB_NAME} ${VTK_LIBS} ${KWSYS_LIBS} ${ZLIB_LIBS}
+   ${GDCM_LIBS} ${DCMTK_LIBS})
+ set(DICOM_LIBRARIES ${LIB_NAME})

Modified: trunk/packages/vtk-dicom/trunk/debian/patches/series
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/series	2014-03-24 10:13:56 UTC (rev 16505)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/series	2014-03-24 11:04:27 UTC (rev 16506)
@@ -1,7 +1,4 @@
-fixcomp.patch
 missingstuff.patch
-lib.patch
-final.patch
 vtk.patch
 vtk2.patch
 vtk3.patch

Modified: trunk/packages/vtk-dicom/trunk/debian/patches/vtk.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/vtk.patch	2014-03-24 10:13:56 UTC (rev 16505)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/vtk.patch	2014-03-24 11:04:27 UTC (rev 16506)
@@ -24,9 +24,11 @@
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- vtk-dicom-0.4.2.orig/Programs/CMakeLists.txt
-+++ vtk-dicom-0.4.2/Programs/CMakeLists.txt
-@@ -10,7 +10,7 @@ set(PROGRAM_SRCS
+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()