[med-svn] r21308 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2016-01-26 18:53:21 +0000 (Tue, 26 Jan 2016)
New Revision: 21308

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Work on gcc-6 transition

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2016-01-26 12:58:25 UTC (rev 21307)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2016-01-26 18:53:21 UTC (rev 21308)
@@ -1,10 +1,19 @@
 insighttoolkit4 (4.8.2-4) UNRELEASED; urgency=medium
 
-  * d/control: Update build dependencies to libpng-dev Closes: #810185
   * d/control: change libinsighttoolkit4-dev depends to use unversioned libdcmtk-dev
+  * d/rules: disable printing out test log, since failed test now print their 
+    error log during the test run. 
+  * d/p/itk_vxl..: add patch to fix compiling VXL with g++-6  
+     
+ -- Gert Wollny <gw.fossdev at gmail.com>  Mon, 11 Jan 2016 12:33:38 +0100
 
- -- Gert Wollny <gw.fossdev at gmail.com>  Thu, 07 Jan 2016 17:27:57 +0100
+insighttoolkit4 (4.8.2-3.1) unstable; urgency=medium
 
+  * Non-maintainer upload.
+  * Change B-D to libpng-dev for libpng 1.6 transition (Closes: #810185)
+
+ -- Tobias Frost <tobi at debian.org>  Tue, 19 Jan 2016 07:28:31 +0100
+
 insighttoolkit4 (4.8.2-3) unstable; urgency=medium
 
   * Tighten dependency on libdcmtk-dev to alliviate #810044

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2016-01-26 12:58:25 UTC (rev 21307)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2016-01-26 18:53:21 UTC (rev 21308)
@@ -1,3 +1,4 @@
 nrrdio-linking.patch
 bsd-hdf5.patch
 #itk-4.8.2-find-doubleconversion.patch
+itk_vxl_gcc6.patch

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2016-01-26 12:58:25 UTC (rev 21307)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2016-01-26 18:53:21 UTC (rev 21308)
@@ -9,9 +9,9 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 ifeq ($(DEB_BUILD_ARCH),i386)
-    ENABLE_FFTW=OFF
+  ENABLE_FFTW=OFF
 else
-    ENABLE_FFTW=ON
+  ENABLE_FFTW=ON
 endif 
 
 CMAKE_FLAGS = \
@@ -77,11 +77,7 @@
 	df -h .
 
 override_dh_auto_test:
-	LD_LIBRARY_PATH=`pwd`/BUILD/lib dh_auto_test || \
-		( echo "Test log begin =========:"  \
-		&& cat `pwd`/BUILD/Testing/Temporary/LastTest.log \
-		&& echo "Test log end =========:" \
-		&& exit 1)
+	LD_LIBRARY_PATH=`pwd`/BUILD/lib dh_auto_test 
 
 override_dh_lintian:
 	echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides