[med-svn] r9404 - in trunk/packages/gdcm/trunk/debian: . patches

Mathieu Malaterre malat-guest at alioth.debian.org
Tue Jan 24 10:57:23 UTC 2012 

Author: malat-guest
Date: 2012-01-24 10:57:23 +0000 (Tue, 24 Jan 2012)
New Revision: 9404

Modified:
   trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
   trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch
Log:
Use new names

Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install	2012-01-24 09:46:27 UTC (rev 9403)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install	2012-01-24 10:57:23 UTC (rev 9404)
@@ -1,2 +1,2 @@
-usr/lib/vtkgdcm-sharp.dll        usr/lib/cli/vtkgdcm-sharp-2.2
-usr/lib/libvtkgdcmsharpglue.so   usr/lib/cli/vtkgdcm-sharp-2.2
+usr/lib/Kitware.VTK.GDCM.dll                usr/lib/cli/vtkgdcm-sharp-2.2
+usr/lib/libKitware.VTK.vtkgdcm.Unmanaged.so usr/lib/cli/vtkgdcm-sharp-2.2

Modified: trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch	2012-01-24 09:46:27 UTC (rev 9403)
+++ trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch	2012-01-24 10:57:23 UTC (rev 9404)
@@ -1,8 +1,8 @@
 Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
 ===================================================================
---- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt	2012-01-24 10:44:33.000000000 +0100
-+++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt	2012-01-24 10:44:35.000000000 +0100
-@@ -126,28 +126,6 @@
+--- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt	2012-01-24 11:55:34.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt	2012-01-24 11:56:43.000000000 +0100
+@@ -126,28 +126,7 @@
  #ENDIF(NOT VTK_BUILD_SHARED_LIBS AND GDCM_BUILD_SHARED_LIBS)
  
  SET_TARGET_PROPERTIES(${VTKGDCM_NAME} PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
@@ -28,10 +28,11 @@
 -  TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF ${vtkgdcm_LIBS})
 -ENDIF(GDCM_USE_ACTIVIZ AND UNIX)
 -
++TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF ${vtkgdcm_LIBS})
  # prevent viral dep of vtkgdcm
  SET_PROPERTY(TARGET ${VTKGDCM_NAME} PROPERTY LINK_INTERFACE_LIBRARIES "")
  IF(NOT GDCM_INSTALL_NO_LIBRARIES)
-@@ -182,10 +160,10 @@
+@@ -182,10 +161,10 @@
      MESSAGE(FATAL_ERROR "you need a newer VTK version >= 5.0")
    ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 4.5 )
  
@@ -46,7 +47,7 @@
  
    FIND_PACKAGE(SWIG REQUIRED)
    MARK_AS_ADVANCED(SWIG_DIR SWIG_EXECUTABLE SWIG_VERSION)
-@@ -249,69 +227,346 @@
+@@ -249,69 +228,346 @@
    IF(GDCM_USE_ACTIVIZ)
      FIND_PACKAGE(ACTIVIZ REQUIRED)
    ELSE(GDCM_USE_ACTIVIZ)
@@ -443,7 +444,7 @@
    ENDIF(GDCM_USE_ACTIVIZ)
  
    #ADD_CUSTOM_COMMAND(
-@@ -321,22 +576,6 @@
+@@ -321,22 +577,6 @@
    #  COMMENT "Copying vtkgdcm-sharp.dll.config"
    #)
  
@@ -466,7 +467,7 @@
  ENDIF(GDCM_WRAP_CSHARP)
  
  IF(GDCM_WRAP_JAVA)
-@@ -360,7 +599,7 @@
+@@ -360,7 +600,7 @@
      endif(EXISTS ${VTK_JAVA_JAR})
      if(EXISTS /usr/lib/jni/libvtkCommonJava.so)
        # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533198
@@ -475,7 +476,7 @@
        link_directories("/usr/lib/jni")
      endif()
      MARK_AS_ADVANCED(GDCM_VTK_JAVA_JAR)
-@@ -422,7 +661,7 @@
+@@ -422,7 +662,7 @@
      ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
  
    ELSE(VTK_WRAP_JAVA)
@@ -484,7 +485,7 @@
    ENDIF(VTK_WRAP_JAVA)
  ENDIF(GDCM_WRAP_JAVA)
  
-@@ -491,7 +730,7 @@
+@@ -491,7 +731,7 @@
      ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
  
    ELSE(VTK_WRAP_PYTHON)
@@ -496,19 +497,19 @@
 Index: gdcm-2.2.0/Utilities/VTK/CscArgs.txt.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/CscArgs.txt.in	2012-01-24 10:44:35.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/CscArgs.txt.in	2012-01-24 11:56:43.000000000 +0100
 @@ -0,0 +1 @@
 + at CscArgs@
 Index: gdcm-2.2.0/Utilities/VTK/dllexportconf.cs
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/dllexportconf.cs	2012-01-24 10:44:35.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/dllexportconf.cs	2012-01-24 11:56:43.000000000 +0100
 @@ -0,0 +1 @@
 +public const string vtkgdcmEL_dll = "libKitware.VTK.vtkgdcm.Unmanaged.so";
 Index: gdcm-2.2.0/Utilities/VTK/gccxml.cxx.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/gccxml.cxx.in	2012-01-24 10:44:35.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/gccxml.cxx.in	2012-01-24 11:56:43.000000000 +0100
 @@ -0,0 +1,16 @@
 +#include "@header@"
 +
@@ -529,7 +530,7 @@
 Index: gdcm-2.2.0/Utilities/VTK/MummySettings.xml.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdcm-2.2.0/Utilities/VTK/MummySettings.xml.in	2012-01-24 10:44:35.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/MummySettings.xml.in	2012-01-24 11:56:43.000000000 +0100
 @@ -0,0 +1,196 @@
 +<MummySettings>
 +
@@ -729,8 +730,8 @@
 +</MummySettings>
 Index: gdcm-2.2.0/CMake/FindACTIVIZ.cmake
 ===================================================================
---- gdcm-2.2.0.orig/CMake/FindACTIVIZ.cmake	2011-12-30 16:37:28.000000000 +0100
-+++ gdcm-2.2.0/CMake/FindACTIVIZ.cmake	2012-01-24 10:44:35.000000000 +0100
+--- gdcm-2.2.0.orig/CMake/FindACTIVIZ.cmake	2012-01-24 11:55:34.000000000 +0100
++++ gdcm-2.2.0/CMake/FindACTIVIZ.cmake	2012-01-24 11:56:43.000000000 +0100
 @@ -15,14 +15,14 @@
  
  FIND_FILE(ACTIVIZ_KITWARE_VTK_LIBRARY

More information about the debian-med-commit mailing list