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

[Gert Wollny]

Author: gert-guest
Date: 2016-07-06 09:35:41 +0000 (Wed, 06 Jul 2016)
New Revision: 22398

Modified:
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Add patch to simplyfy arch-all, thanks: Santiago Vila

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2016-07-06 07:22:44 UTC (rev 22397)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2016-07-06 09:35:41 UTC (rev 22398)
@@ -29,6 +29,7 @@
 	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
 	-DITK_USE_SYSTEM_DCMTK:BOOL=ON \
 	-DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=ON \
+	-DITK_USE_SYSTEM_EXPAT:BOOL=ON \
 	-DITK_USE_SYSTEM_FFTW:BOOL=$(ENABLE_FFTW) \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
 	-DITK_USE_SYSTEM_HDF5:BOOL=ON \
@@ -70,13 +71,19 @@
 %:
 	dh $@ --builddir=BUILD --parallel
 
-override_dh_auto_configure: pre-build
+override_dh_auto_configure-indep:
+
+override_dh_auto_configure-arch: pre-build
 	dh_auto_configure -- $(CMAKE_FLAGS)
 
+override_dh_auto_build-indep:
+
 pre-build:
 	echo "Available disk space (~50GB of space is needed for the build):"
 	df -h .
 
+override_dh_auto_test-indep:
+
 override_dh_auto_test:
 	LD_LIBRARY_PATH=`pwd`/BUILD/lib dh_auto_test 
 
@@ -84,7 +91,9 @@
 	echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides
 	dh_lintian
 
-override_dh_install: 
+override_dh_install-indep:
+
+override_dh_install-arch:
 	# pkg_lib
 	dh_install -p$(pkg_lib) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so.* usr/lib
 	cp CMake/InsightValgrind.supp Insight$(SOVERSION)Valgrind.supp