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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-28 15:12:27 +0000 (Fri, 28 Oct 2011)
New Revision: 8351

Modified:
   trunk/packages/activiz.net/trunk/debian/patches/series
   trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch
   trunk/packages/activiz.net/trunk/debian/rules
Log:
install html doc

Modified: trunk/packages/activiz.net/trunk/debian/patches/series
===================================================================
--- trunk/packages/activiz.net/trunk/debian/patches/series	2011-10-28 14:45:17 UTC (rev 8350)
+++ trunk/packages/activiz.net/trunk/debian/patches/series	2011-10-28 15:12:27 UTC (rev 8351)
@@ -4,3 +4,4 @@
 vtk_hints_location.patch
 donotinstallmummydll.patch
 doxygenversion.patch
+removedoxfromall.patch

Modified: trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch
===================================================================
--- trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch	2011-10-28 14:45:17 UTC (rev 8350)
+++ trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch	2011-10-28 15:12:27 UTC (rev 8351)
@@ -1,7 +1,7 @@
 Index: activiz.net-5.6.1/CMakeLists.txt
 ===================================================================
---- activiz.net-5.6.1.orig/CMakeLists.txt	2011-02-17 11:28:53.000000000 +0100
-+++ activiz.net-5.6.1/CMakeLists.txt	2011-02-17 11:31:24.000000000 +0100
+--- 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")
  
@@ -21,9 +21,9 @@
      vtkRenderPass
 Index: activiz.net-5.6.1/MummySettings.xml.in
 ===================================================================
---- activiz.net-5.6.1.orig/MummySettings.xml.in	2011-02-17 11:29:53.000000000 +0100
-+++ activiz.net-5.6.1/MummySettings.xml.in	2011-02-17 11:29:41.000000000 +0100
-@@ -65,7 +65,7 @@
+--- activiz.net-5.6.1.orig/MummySettings.xml.in	2011-10-28 16:14:47.000000000 -0400
++++ activiz.net-5.6.1/MummySettings.xml.in	2011-10-28 16:15:01.000000000 -0400
+@@ -68,7 +68,7 @@
      endExcludeRegex="^[\t ]*//ETX.*$"
      countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
      emitDefaultFactoryMethod="true"
@@ -32,7 +32,7 @@
      />
  
    <!-- vtkImageData: extra hand-crafted code -->
-@@ -85,7 +85,7 @@
+@@ -88,7 +88,7 @@
      endExcludeRegex="^[\t ]*//ETX.*$"
      countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
      emitDefaultFactoryMethod="true"
@@ -41,7 +41,7 @@
      />
  
    <!-- vtkImplicitFunction: shadow="true" -->
-@@ -103,7 +103,7 @@
+@@ -106,7 +106,7 @@
      endExcludeRegex="^[\t ]*//ETX.*$"
      countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
      emitDefaultFactoryMethod="true"
@@ -50,7 +50,7 @@
      />
  
    <!-- vtkObject: extra hand-crafted code -->
-@@ -123,7 +123,7 @@
+@@ -126,7 +126,7 @@
      endExcludeRegex="^[\t ]*//ETX.*$"
      countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
      emitDefaultFactoryMethod="true"
@@ -59,7 +59,7 @@
      />
  
    <!-- vtkProgrammableAttributeDataFilter: extra hand-crafted code -->
-@@ -143,7 +143,7 @@
+@@ -146,7 +146,7 @@
      endExcludeRegex="^[\t ]*//ETX.*$"
      countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
      emitDefaultFactoryMethod="true"
@@ -68,7 +68,7 @@
      />
  
    <!-- vtkStringArray: extra hand-crafted code -->
-@@ -163,7 +163,7 @@
+@@ -166,7 +166,7 @@
      endExcludeRegex="^[\t ]*//ETX.*$"
      countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
      emitDefaultFactoryMethod="true"
@@ -77,7 +77,7 @@
      />
  
    <!-- vtkTimePointUtility: excludeMarkedLines="true" -->
-@@ -182,7 +182,7 @@
+@@ -185,7 +185,7 @@
      excludeMarkedLines="true"
      countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
      emitDefaultFactoryMethod="true"
@@ -86,7 +86,7 @@
      />
  
  
-@@ -201,7 +201,7 @@
+@@ -204,7 +204,7 @@
      endExcludeRegex="^[\t ]*//ETX.*$"
      countedMethodsRegex="^(CreateImageReader2|CreateInstance|MakeTransform|New|NewInstance)$"
      emitDefaultFactoryMethod="true"

Modified: trunk/packages/activiz.net/trunk/debian/rules
===================================================================
--- trunk/packages/activiz.net/trunk/debian/rules	2011-10-28 14:45:17 UTC (rev 8350)
+++ trunk/packages/activiz.net/trunk/debian/rules	2011-10-28 15:12:27 UTC (rev 8351)
@@ -10,7 +10,7 @@
 	-DGENERATE_DOXYGEN:BOOL=ON
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with cli
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_FLAGS)
@@ -26,5 +26,21 @@
 override_dh_compress:
 	dh_compress -XUsersGuide.pdf
 
+# Let's be smart with building doc
+override_dh_auto_build-indep:
+	$(MAKE) AVDN_doxygen
+
+# No tests needed for docs
+override_dh_auto_test-indep:
+
+#override_dh_auto_install-indep:
+#	$(MAKE) install
+
+pkg_doc = activiz.net-doc
+
+override_dh_install:
+	dh_install -p$(pkg_doc) obj-*/html usr/share/doc/$(pkg_doc)/
+	dh_install
+
 get-orig-source:
 	./debian/get-orig-source