[med-svn] r9403 - trunk/packages/gdcm/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-01-24 09:46:27 +0000 (Tue, 24 Jan 2012)
New Revision: 9403

Modified:
   trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch
Log:
fix for mummy

Modified: trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch	2012-01-24 09:40:54 UTC (rev 9402)
+++ trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch	2012-01-24 09:46:27 UTC (rev 9403)
@@ -1,7 +1,7 @@
 Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
 ===================================================================
---- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt	2012-01-23 11:24:33.000000000 +0100
-+++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt	2012-01-24 10:39:39.000000000 +0100
+--- 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 @@
  #ENDIF(NOT VTK_BUILD_SHARED_LIBS AND GDCM_BUILD_SHARED_LIBS)
  
@@ -496,19 +496,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:39:39.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/CscArgs.txt.in	2012-01-24 10:44:35.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:39:39.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/dllexportconf.cs	2012-01-24 10:44:35.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:39:39.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/gccxml.cxx.in	2012-01-24 10:44:35.000000000 +0100
 @@ -0,0 +1,16 @@
 +#include "@header@"
 +
@@ -529,7 +529,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:39:39.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/MummySettings.xml.in	2012-01-24 10:44:35.000000000 +0100
 @@ -0,0 +1,196 @@
 +<MummySettings>
 +
@@ -727,3 +727,24 @@
 +    />
 +
 +</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
+@@ -15,14 +15,14 @@
+ 
+ FIND_FILE(ACTIVIZ_KITWARE_VTK_LIBRARY
+   NAMES Kitware.VTK.dll
+-  PATHS /usr/lib /usr/local/lib /usr/lib/cli/activiz-cil
++  PATHS /usr/lib /usr/local/lib /usr/lib/cli/activiz-cil /usr/lib/cli/ActiViz.NET
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Kitware\\ActiVizDotNet 5.2.1]/bin"
+   $ENV{ACTIVIZ_ROOT}/bin
+   )
+ 
+ FIND_FILE(ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY
+   NAMES Kitware.mummy.Runtime.dll
+-  PATHS /usr/lib /usr/local/lib /usr/lib/cli/activiz-cil
++  PATHS /usr/lib /usr/local/lib /usr/lib/cli/activiz-cil /usr/lib/cli/Kitware.mummy.Runtime-1.0
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Kitware\\ActiVizDotNet 5.2.1]/bin"
+   $ENV{ACTIVIZ_ROOT}/bin
+   )