[SCM] Debian packaging for openturns www.openturns.org branch, debian, updated. debian/1.0-4-7-ge961036

[Denis Barbier]

The following commit has been merged in the debian branch:
commit e961036896ee14bf9ecea98b58b330f786444dcc
Author: Denis Barbier <bouzim at gmail.com>
Date:   Mon Sep 3 23:49:18 2012 +0200

    Remove debian/patches/disable-test-wrapper.patch
    
    As upstream explained at http://trac.openturns.org/ticket/476
    OPENTURNS_HOME can be set to tell wrapper where to find its DTD.

diff --git a/debian/patches/disable-test-wrapper.patch b/debian/patches/disable-test-wrapper.patch
deleted file mode 100644
index 8e73324..0000000
--- a/debian/patches/disable-test-wrapper.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Disable WrapperFile_std test
- It does not work when installing in DESTDIR.
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: http://trac.openturns.org/ticket/476
-Last-Update: 2012-04-25
-
-Index: openturns/python/test/CMakeLists.txt
-===================================================================
---- openturns.orig/python/test/CMakeLists.txt
-+++ openturns/python/test/CMakeLists.txt
-@@ -140,7 +140,7 @@ ot_pyinstallcheck_test ( HermitianMatrix
- ot_pyinstallcheck_test ( TriangularComplexMatrix_std )
- 
- # Func
--ot_pyinstallcheck_test ( WrapperFile_std )
-+#DEB#ot_pyinstallcheck_test ( WrapperFile_std ) # Does not work when installing in DESTDIR
- ot_pyinstallcheck_test ( NumericalMathFunction_std )
- ot_pyinstallcheck_test ( NumericalMathFunction_grad )
- ot_pyinstallcheck_test ( NumericalMathFunction_hess )
diff --git a/debian/patches/series b/debian/patches/series
index 9337f8c..be45e67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ cmake-tools.patch
 no-link-python.patch
 bigendian-randomgenerator.patch
 installcheck.patch
-disable-test-wrapper.patch
 test-output.patch
 debian-soname.patch
 ftbfs-clang.patch
diff --git a/debian/rules b/debian/rules
index 37eab1e..e13ebac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ override_dh_auto_install: debian/tmp/usr/lib/R/site-library/rotRPackage
 	-mkdir -p debian/tmp/usr/share/openturns/m4
 	cp lib/m4/*.m4 debian/tmp/usr/share/openturns/m4
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	CTEST_OUTPUT_ON_FAILURE=1 $(MAKE) $(test_makeflags) -C $(builddir) installcheck
+	CTEST_OUTPUT_ON_FAILURE=1 OPENTURNS_HOME=$(CURDIR)/debian/tmp/usr $(MAKE) $(test_makeflags) -C $(builddir) installcheck
 endif
 	#  Fix script permissions
 	chmod a+x debian/tmp/usr/share/openturns/WrapperTemplates/wrapper_*/customize debian/tmp/usr/share/openturns/WrapperTemplates/wrapper_*/bootstrap

-- 
Debian packaging for openturns www.openturns.org