[med-svn] r17005 - trunk/packages/insighttoolkit/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2014-05-25 16:15:55 +0000 (Sun, 25 May 2014)
New Revision: 17005

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Modify rules to dump test log without using .ONESHELL.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2014-05-24 18:11:53 UTC (rev 17004)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2014-05-25 16:15:55 UTC (rev 17005)
@@ -1,11 +1,9 @@
-insighttoolkit4 (4.5.2-2) UNRELEASED; urgency=medium
+insighttoolkit4 (4.5.2-2) unstable; urgency=medium
 
   * Bump gccxml dependency to  0.9.0+git20140205 because it seems
     to be required for builds with g++-4.8
   * Add some magic to d/rules to dump the test log to stdout if the
     tests fail
-  * Add dependency on make (>= 4.0) because above rule requires it 
-    and the default stills seems to be at 3.81 
 
  -- Gert Wollny <gw.fossdev at gmail.com>  Fri, 23 May 2014 14:19:45 +0200
 
@@ -19,7 +17,6 @@
   * patches/0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch:
     Remove; applied upstream.
 
-
  -- Steve M. Robbins <smr at debian.org>  Sun, 13 Apr 2014 07:31:59 -0500
 
 insighttoolkit4 (4.5.1-1) unstable; urgency=medium

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2014-05-24 18:11:53 UTC (rev 17004)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2014-05-25 16:15:55 UTC (rev 17005)
@@ -21,8 +21,7 @@
 	libhdf5-dev, 
 	python-all-dev, 
 	libvtk5-dev, 
-	python-vtk,
-	make (>= 4.0)
+	python-vtk
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/insighttoolkit/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/insighttoolkit/trunk/

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2014-05-24 18:11:53 UTC (rev 17004)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2014-05-25 16:15:55 UTC (rev 17005)
@@ -21,8 +21,7 @@
 	libhdf5-dev, 
 	python-all-dev, 
 	libvtk5-dev, 
-	python-vtk,
-	make (>= 4.0)
+	python-vtk
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/insighttoolkit/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/insighttoolkit/trunk/

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2014-05-24 18:11:53 UTC (rev 17004)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2014-05-25 16:15:55 UTC (rev 17005)
@@ -88,15 +88,13 @@
 	echo "Available disk space:"
 	df -h .
 
-.ONESHELL: 
 override_dh_auto_test:
-	LD_LIBRARY_PATH=`pwd`/BUILD/lib dh_auto_test && exit 0
-	@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 || \
+		( echo "Test log begin =========:"  \
+		&& cat `pwd`/BUILD/Testing/Temporary/LastTest.log \
+		&& echo "Test log end =========:" \
+		&& exit 1)
 
-
 override_dh_lintian:
 	echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides
 	dh_lintian