[med-svn] r19328 - in trunk/packages/camitk/trunk/debian: . patches

[Emmanuel Promayon]

Author: promayon-guest
Date: 2015-06-15 13:55:46 +0000 (Mon, 15 Jun 2015)
New Revision: 19328

Added:
   trunk/packages/camitk/trunk/debian/patches/
   trunk/packages/camitk/trunk/debian/patches/force-path-to-itkconfig
   trunk/packages/camitk/trunk/debian/patches/series
Modified:
   trunk/packages/camitk/trunk/debian/changelog
   trunk/packages/camitk/trunk/debian/rules
Log:
Tentative FTBS fix


Modified: trunk/packages/camitk/trunk/debian/changelog
===================================================================
--- trunk/packages/camitk/trunk/debian/changelog	2015-06-12 12:44:03 UTC (rev 19327)
+++ trunk/packages/camitk/trunk/debian/changelog	2015-06-15 13:55:46 UTC (rev 19328)
@@ -1,3 +1,12 @@
+camitk (3.4.0-2) unstable; urgency=low
+
+  * Fix cmake missing path to ITKConfig
+    Closes: #787753
+  * Increase test timeout for slower arch
+  * fix timestamps_in_documentation_generated_by_doxygen (improve building reproducibility)
+
+ -- Emmanuel Promayon <Emmanuel.Promayon at imag.fr>  Mon, 15 Jun 2015 09:08:38 +0200
+
 camitk (3.4.0-1) unstable; urgency=medium
 
   * New upstream release. 

Added: trunk/packages/camitk/trunk/debian/patches/force-path-to-itkconfig
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/force-path-to-itkconfig	                        (rev 0)
+++ trunk/packages/camitk/trunk/debian/patches/force-path-to-itkconfig	2015-06-15 13:55:46 UTC (rev 19328)
@@ -0,0 +1,11 @@
+--- a/sdk/cmake/modules/macros/CamiTKExtension.cmake
++++ b/sdk/cmake/modules/macros/CamiTKExtension.cmake
+@@ -202,7 +202,7 @@
+         # Looking for ITK
+         set(ITK_LIBRARIES "")
+         if(${EXTENSION_NAME_CMAKE}_NEEDS_ITK)
+-            find_package(ITK REQUIRED)
++            find_package(ITK REQUIRED PATHS /usr/lib/InsightToolkit)
+             if(ITK_FOUND)
+                 include(${ITK_USE_FILE})
+                 set(ITK_VERSION ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}) #ITK_VERSION is not always set

Added: trunk/packages/camitk/trunk/debian/patches/series
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/camitk/trunk/debian/patches/series	2015-06-15 13:55:46 UTC (rev 19328)
@@ -0,0 +1,2 @@
+remove-doxygen-timestamp
+force-path-to-itkconfig

Modified: trunk/packages/camitk/trunk/debian/rules
===================================================================
--- trunk/packages/camitk/trunk/debian/rules	2015-06-12 12:44:03 UTC (rev 19327)
+++ trunk/packages/camitk/trunk/debian/rules	2015-06-15 13:55:46 UTC (rev 19328)
@@ -41,7 +41,8 @@
 # - generic (to tell cmake to build proper binaries)
 # - CamiTK specific options
 # Notes:
-# - if you would like a more verbose camitk at run-time, you can add -DCAMITK_LOG_LEVEL=2
+# - if you would like a more verbose camitk at run-time, 
+#   you can add -DCAMITK_LOG_LEVEL=2
 # - translation is not ready yet, so disable for now
 CMAKE_EXTRA_FLAGS = \
 	-DCMAKE_SKIP_RPATH:BOOL=TRUE \
@@ -55,10 +56,12 @@
 	-DCAMITK_DISABLE_TRANSLATION=TRUE
 
 %:
-	# For debian build, do not authorize parallel build (too much RAM needed for Imaging CEP)
-	dh $@ --builddirectory=camitk-build
-	# For local personal build, parallel is ok as there is enough RAM for heavy-templated Imaging CEP
-	#dh $@ --parallel --builddirectory=camitk-build  
+	# For debian build, do not authorize parallel build (too much RAM 
+	# needed for Imaging CEP on arch that have small memory size)
+	#dh $@ --builddirectory=camitk-build
+	# For local personal build, parallel is ok as there is enough RAM
+	# for heavy-templated Imaging CEP (uncomment for local fast rebuild)
+	dh $@ --parallel --builddirectory=camitk-build  
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
@@ -77,7 +80,7 @@
 	# Use the CamiTK test suite
 	# Note: all tests require an X server, xvfb-run is needed to have a virtual one
 	# Another way: xvfb-run --auto-servernum $(MAKE) -C camitk-build ARGS="-V" test
-	(cd camitk-build && xvfb-run --auto-servernum ctest -V --timeout 300)
+	(cd camitk-build && xvfb-run --auto-servernum ctest -V --timeout 600)
 
 # make packages
 override_dh_install: