[SCM] Packaging for getfem++ branch, master, updated. debian/4.2+dfsg1-1_exp3-10-g28a2655

[Anton Gladky]

The following commit has been merged in the master branch:
commit 56bde739e126cfd6c7577d501c91c64441c6f040
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue May 7 18:45:56 2013 +0200

    Disable some more tests, which are unreliable.

diff --git a/debian/patches/disable_some_tests.patch b/debian/patches/disable_some_tests.patch
index 0b86973..af9e09f 100644
--- a/debian/patches/disable_some_tests.patch
+++ b/debian/patches/disable_some_tests.patch
@@ -1,6 +1,6 @@
 Description: disable tests, which are unreliable on some platforms.
 Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-02-03
+Last-Update: 2013-05-07
 
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
@@ -45,15 +45,16 @@ Last-Update: 2013-02-03
  
  
  SUPLDFLAGS = @SUPLDFLAGS@
-@@ -128,7 +120,6 @@
+@@ -127,8 +119,6 @@
+ 	$(top_srcdir)/tests/test_interpolated_fem.pl      \
  	$(top_srcdir)/tests/test_range_basis.pl           \
  	$(top_srcdir)/tests/laplacian.pl                  \
- 	$(top_srcdir)/tests/laplacian_with_bricks.pl      \
+-	$(top_srcdir)/tests/laplacian_with_bricks.pl      \
 -	$(top_srcdir)/tests/elastostatic.pl               \
  	$(top_srcdir)/tests/stokes.pl                     \
  	$(top_srcdir)/tests/plate.pl                      \
  	$(optpl)                                          \
-@@ -139,10 +130,7 @@
+@@ -139,10 +129,7 @@
  	$(top_srcdir)/tests/plasticity_old_brick.pl       \
  	$(top_srcdir)/tests/helmholtz.pl                  \
  	$(top_srcdir)/tests/schwarz_additive.pl           \
@@ -64,7 +65,7 @@ Last-Update: 2013-02-03
  	$(top_srcdir)/tests/cyl_slicer.pl	          \
  	$(top_srcdir)/tests/make_gmm_test.pl
  
-@@ -156,7 +144,6 @@
+@@ -156,7 +143,6 @@
  	test_assembly.pl                   			\
  	laplacian.pl                       			\
  	laplacian_with_bricks.pl 	   			\
@@ -72,7 +73,7 @@ Last-Update: 2013-02-03
  	stokes.pl                          			\
  	helmholtz.pl                       			\
  	integration.pl                     			\
-@@ -176,13 +163,10 @@
+@@ -176,13 +162,10 @@
  	laplacian_with_bricks.param        			\
  	test_range_basis.param             			\
  	test_range_basis.pl                			\
@@ -86,7 +87,7 @@ Last-Update: 2013-02-03
  	stokes.param                       			\
  	nonlinear_elastostatic.pl          			\
  	nonlinear_membrane.pl              			\
-@@ -196,11 +180,7 @@
+@@ -196,11 +179,7 @@
  	plasticity_old_brick.param             			\
  	nonlinear_elastostatic.param       			\
  	test_interpolated_fem.param        			\
@@ -98,3 +99,23 @@ Last-Update: 2013-02-03
  	wave_equation.pl                   			\
  	wave_equation.param                			\
  	cyl_slicer.pl                           		\
+--- a/interface/tests/python/Makefile.am
++++ b/interface/tests/python/Makefile.am
+@@ -20,7 +20,6 @@
+ if BUILDPYTHON
+ TESTS = 						\
+ 	$(srcdir)/check_export.py			\
+-	$(srcdir)/check_global_functions.py		\
+ 	$(srcdir)/demo_wave.py				\
+ 	$(srcdir)/demo_laplacian.py			\
+ 	$(srcdir)/check_levelset.py
+--- a/interface/tests/python/Makefile.in
++++ b/interface/tests/python/Makefile.in
+@@ -236,7 +236,6 @@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = \
+ 	check_export.py 		\
+-	check_global_functions.py	\
+ 	check_levelset.py		\
+ 	demo_crack.py 			\
+ 	demo_fictitious_domains.py 	\
diff --git a/debian/rules b/debian/rules
index 49b8e10..75a7442 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with python2 --parallel
+	dh $@ --with python2 --parallel --with autoreconf
 
 #=====================================================================
 # These are used for cross-compiling and for saving the configure script
@@ -34,7 +34,7 @@ disable_scilab_archs   = mips kfreebsd-amd64 kfreebsd-i386 s390x hurd-i386
 ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_scilab_archs)))
 	configure_flags += --disable-scilab
 else
-	configure_flags += --enable-scilab --with-scilab-toolbox-dir=$(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/
+	configure_flags += --enable-scilab --with-scilab-toolbox-dir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/scilab-getfem++/
 endif
 
 disable_muparser_archs = hurd-i386

-- 
Packaging for getfem++