[med-svn] r8422 - in trunk/packages/activiz.net/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-11-05 15:21:25 +0000 (Sat, 05 Nov 2011)
New Revision: 8422

Modified:
   trunk/packages/activiz.net/trunk/debian/control
   trunk/packages/activiz.net/trunk/debian/patches/donotinstallmummydll.patch
   trunk/packages/activiz.net/trunk/debian/patches/removedoxfromall.patch
   trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch
   trunk/packages/activiz.net/trunk/debian/rules
Log:
simplify patch system. refresh patch

Modified: trunk/packages/activiz.net/trunk/debian/control
===================================================================
--- trunk/packages/activiz.net/trunk/debian/control	2011-11-05 15:12:46 UTC (rev 8421)
+++ trunk/packages/activiz.net/trunk/debian/control	2011-11-05 15:21:25 UTC (rev 8422)
@@ -16,7 +16,7 @@
 Package: libactiviz.net5.6-cil
 Architecture: any
 Section: cli-mono
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
 Description: Tool for generating C# wrappers around VTK
  ActiViz provides a powerful interface to the Visualization Toolkit (VTK), an
  object-oriented software system encompassing thousands of algorithms that

Modified: trunk/packages/activiz.net/trunk/debian/patches/donotinstallmummydll.patch
===================================================================
--- trunk/packages/activiz.net/trunk/debian/patches/donotinstallmummydll.patch	2011-11-05 15:12:46 UTC (rev 8421)
+++ trunk/packages/activiz.net/trunk/debian/patches/donotinstallmummydll.patch	2011-11-05 15:21:25 UTC (rev 8422)
@@ -1,8 +1,8 @@
 Index: activiz.net-5.6.1/CMakeLists.txt
 ===================================================================
---- activiz.net-5.6.1.orig/CMakeLists.txt	2011-02-17 12:14:12.000000000 +0100
-+++ activiz.net-5.6.1/CMakeLists.txt	2011-02-17 12:14:25.000000000 +0100
-@@ -1260,8 +1260,8 @@
+--- activiz.net-5.6.1.orig/CMakeLists.txt	2011-11-05 16:20:39.000000000 +0100
++++ activiz.net-5.6.1/CMakeLists.txt	2011-11-05 16:20:41.000000000 +0100
+@@ -1250,8 +1250,8 @@
    ENDIF(CMAKE_CONFIGURATION_TYPES)
  
    SET(AVDN_INSTALL_FILES ${AVDN_INSTALL_FILES}

Modified: trunk/packages/activiz.net/trunk/debian/patches/removedoxfromall.patch
===================================================================
--- trunk/packages/activiz.net/trunk/debian/patches/removedoxfromall.patch	2011-11-05 15:12:46 UTC (rev 8421)
+++ trunk/packages/activiz.net/trunk/debian/patches/removedoxfromall.patch	2011-11-05 15:21:25 UTC (rev 8422)
@@ -1,8 +1,8 @@
 Index: activiz.net-5.6.1/CMakeLists.txt
 ===================================================================
---- activiz.net-5.6.1.orig/CMakeLists.txt	2011-10-28 17:32:15.000000000 +0200
-+++ activiz.net-5.6.1/CMakeLists.txt	2011-10-28 17:32:17.000000000 +0200
-@@ -1338,7 +1338,7 @@
+--- activiz.net-5.6.1.orig/CMakeLists.txt	2011-11-05 16:20:41.000000000 +0100
++++ activiz.net-5.6.1/CMakeLists.txt	2011-11-05 16:20:47.000000000 +0100
+@@ -1328,7 +1328,7 @@
    @ONLY
    )
  

Modified: trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch
===================================================================
--- trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch	2011-11-05 15:12:46 UTC (rev 8421)
+++ trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch	2011-11-05 15:21:25 UTC (rev 8422)
@@ -1,24 +1,3 @@
-Index: activiz.net-5.6.1/CMakeLists.txt
-===================================================================
---- activiz.net-5.6.1.orig/CMakeLists.txt	2011-10-28 16:15:00.000000000 -0400
-+++ activiz.net-5.6.1/CMakeLists.txt	2011-10-28 16:15:01.000000000 -0400
-@@ -241,6 +241,16 @@
- ENDIF(EXISTS "${VTK_DIR}/CMakeCache.txt")
- 
- 
-+# vtkMPIController.cs(155,37): error CS0508:
-+# `Kitware.VTK.vtkMPIController.CreateSubController(Kitware.VTK.vtkProcessGroup)':
-+# return type must be `Kitware.VTK.vtkMultiProcessController' to match overridden
-+# member
-+# `Kitware.VTK.vtkMultiProcessController.CreateSubController(Kitware.VTK.vtkProcessGroup)'
-+# Cannot get covariant return type to work
-+SET(AVDN_EXTRA_EXCLUDE_CLASSES ${AVDN_EXTRA_EXCLUDE_CLASSES}
-+  vtkMPIController
-+  vtkMPICommunicator
-+  )
- IF(${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} LESS 5.6)
-   SET(AVDN_EXTRA_EXCLUDE_CLASSES ${AVDN_EXTRA_EXCLUDE_CLASSES}
-     vtkRenderPass
 Index: activiz.net-5.6.1/MummySettings.xml.in
 ===================================================================
 --- activiz.net-5.6.1.orig/MummySettings.xml.in	2011-10-28 16:14:47.000000000 -0400

Modified: trunk/packages/activiz.net/trunk/debian/rules
===================================================================
--- trunk/packages/activiz.net/trunk/debian/rules	2011-11-05 15:12:46 UTC (rev 8421)
+++ trunk/packages/activiz.net/trunk/debian/rules	2011-11-05 15:21:25 UTC (rev 8422)
@@ -7,6 +7,7 @@
 CMAKE_FLAGS = \
 	-DAVDN_INSTALL_PREFIX:PATH=/usr \
 	-DAVDN_SNKEYFILE:STRING=/usr/share/cli-common/keys/mono.snk \
+	-DAVDN_EXTRA_EXCLUDE_CLASSES:STRING="vtkMPIController;vtkMPICommunicator" \
 	-DGENERATE_DOXYGEN:BOOL=ON
 
 %: