[med-svn] r10860 - in trunk/packages/insighttoolkit/branches/3.20.1/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-05-14 10:16:21 +0000 (Mon, 14 May 2012)
New Revision: 10860

Added:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ITKNrrdIOmath.patch
Modified:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
   trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
   trunk/packages/insighttoolkit/branches/3.20.1/debian/rules
Log:
Add missing link to math lib

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2012-05-14 10:04:49 UTC (rev 10859)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2012-05-14 10:16:21 UTC (rev 10860)
@@ -3,6 +3,8 @@
   * Fix VolView compilation. Closes: #667411
   * Add hardening flags. Remove some overlinking
   * Add math lib for openjpeg. Closes: #672866
+  * Add math lib for ITKNrrdIO. Closes: #672869
+  * Fix dh_clean rules
 
  -- Mathieu Malaterre <malat at debian.org>  Mon, 14 May 2012 11:59:15 +0200
 

Added: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ITKNrrdIOmath.patch
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ITKNrrdIOmath.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ITKNrrdIOmath.patch	2012-05-14 10:16:21 UTC (rev 10860)
@@ -0,0 +1,14 @@
+Index: insighttoolkit-3.20.1/Utilities/NrrdIO/CMakeLists.txt
+===================================================================
+--- insighttoolkit-3.20.1.orig/Utilities/NrrdIO/CMakeLists.txt	2012-05-14 12:11:03.706065729 +0200
++++ insighttoolkit-3.20.1/Utilities/NrrdIO/CMakeLists.txt	2012-05-14 12:11:30.474064761 +0200
+@@ -58,6 +58,9 @@
+ 
+ ADD_LIBRARY(ITKNrrdIO ${nrrdio_SRCS} )
+ TARGET_LINK_LIBRARIES(ITKNrrdIO ${ITK_ZLIB_LIBRARIES} )
++IF(UNIX)
++  TARGET_LINK_LIBRARIES(ITKNrrdIO m)
++ENDIF(UNIX)
+ 
+ IF(ITK_LIBRARY_PROPERTIES)
+   SET_TARGET_PROPERTIES(ITKNrrdIO PROPERTIES ${ITK_LIBRARY_PROPERTIES})

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series	2012-05-14 10:04:49 UTC (rev 10859)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series	2012-05-14 10:16:21 UTC (rev 10860)
@@ -12,3 +12,4 @@
 png15support.patch
 ftbfs-gcc-4.7.diff
 openjpegmath.patch
+ITKNrrdIOmath.patch

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/rules	2012-05-14 10:04:49 UTC (rev 10859)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/rules	2012-05-14 10:16:21 UTC (rev 10860)
@@ -68,6 +68,10 @@
 	echo "$(pkg_lib): embedded-library usr/lib/libitkopenjpeg.so.$(VER_FULL): openjpeg" >> debian/$(pkg_lib).lintian-overrides
 	dh_lintian
 
+override_dh_clean: 
+	dh_clean Insight$(SOVERSION)Valgrind.supp
+	dh_clean Insight$(SOVERSION)VxlValgrind.supp
+
 override_dh_install: 
 	# pkg_lib
 	dh_install -p$(pkg_lib) -XJava -XPython -XTcl debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib