[getfem] 02/03: Fix FTBFS caused by the previous upload

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository getfem.

commit 942a5182481a1b642ef82d4d12396c9c5519cbb4
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Aug 16 21:18:23 2017 +0200

    Fix FTBFS caused by the previous upload
---
 debian/patches/05_disable_failing_test.patch | 38 ++++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/debian/patches/05_disable_failing_test.patch b/debian/patches/05_disable_failing_test.patch
index cb478cf..40e7168 100644
--- a/debian/patches/05_disable_failing_test.patch
+++ b/debian/patches/05_disable_failing_test.patch
@@ -2,11 +2,11 @@ Description: Disable two failing tests
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2016-08-25
 
-Index: getfem/tests/Makefile.am
+Index: getfem-5.2/tests/Makefile.am
 ===================================================================
---- getfem.orig/tests/Makefile.am
-+++ getfem/tests/Makefile.am
-@@ -45,22 +45,15 @@ check_PROGRAMS =                   \
+--- getfem-5.2.orig/tests/Makefile.am
++++ getfem-5.2/tests/Makefile.am
+@@ -45,22 +45,14 @@ check_PROGRAMS =                   \
  	test_interpolated_fem      \
  	test_range_basis           \
  	laplacian                  \
@@ -16,7 +16,7 @@ Index: getfem/tests/Makefile.am
 -	helmholtz                  \
 -	plate                      \
 -	nonlinear_elastostatic     \
- 	nonlinear_membrane         \
+-	nonlinear_membrane         \
  	schwarz_additive           \
  	$(optprogs)                \
  	plasticity                 \
@@ -30,7 +30,7 @@ Index: getfem/tests/Makefile.am
  
  CLEANFILES = \
  	laplacian.res laplacian.mesh laplacian.dataelt 			    \
-@@ -82,14 +75,9 @@ test_kdtree_SOURCES = test_kdtree.cc
+@@ -82,14 +74,8 @@ test_kdtree_SOURCES = test_kdtree.cc
  test_rtree_SOURCES = test_rtree.cc
  test_assembly_SOURCES = test_assembly.cc
  laplacian_SOURCES = laplacian.cc
@@ -40,12 +40,12 @@ Index: getfem/tests/Makefile.am
 -elastostatic_SOURCES = elastostatic.cc
  stokes_SOURCES = stokes.cc
 -nonlinear_elastostatic_SOURCES = nonlinear_elastostatic.cc
- nonlinear_membrane_SOURCES = nonlinear_membrane.cc
+-nonlinear_membrane_SOURCES = nonlinear_membrane.cc
 -helmholtz_SOURCES = helmholtz.cc
  integration_SOURCES = integration.cc
  poly_SOURCES = poly.cc
  test_mesh_SOURCES = test_mesh.cc
-@@ -108,7 +96,6 @@ test_mesh_im_level_set_SOURCES = test_me
+@@ -108,7 +94,6 @@ test_mesh_im_level_set_SOURCES = test_me
  crack_SOURCES = crack.cc
  thermo_elasticity_electrical_coupling_SOURCES = thermo_elasticity_electrical_coupling.cc
  endif
@@ -53,7 +53,7 @@ Index: getfem/tests/Makefile.am
  heat_equation_SOURCES = heat_equation.cc
  wave_equation_SOURCES = wave_equation.cc
  cyl_slicer_SOURCES = cyl_slicer.cc
-@@ -137,21 +124,13 @@ TESTS = \
+@@ -137,21 +122,12 @@ TESTS = \
  	test_interpolated_fem.pl      \
  	test_range_basis.pl           \
  	laplacian.pl                  \
@@ -63,7 +63,7 @@ Index: getfem/tests/Makefile.am
 -	plate.pl                      \
  	$(optpl)                      \
 -	nonlinear_elastostatic.pl     \
- 	nonlinear_membrane.pl         \
+-	nonlinear_membrane.pl         \
  	test_continuation.pl   	      \
 -        plasticity.pl                 \
 -	helmholtz.pl                  \
@@ -75,7 +75,7 @@ Index: getfem/tests/Makefile.am
  	cyl_slicer.pl	              \
  	make_gmm_test.pl
  
-@@ -164,10 +143,7 @@ EXTRA_DIST =
+@@ -164,10 +140,7 @@ EXTRA_DIST =
  	test_interpolation.pl              			\
  	test_assembly.pl                   			\
  	laplacian.pl                       			\
@@ -86,7 +86,7 @@ Index: getfem/tests/Makefile.am
  	integration.pl                     			\
  	poly.pl                            			\
  	test_mesh.pl                       			\
-@@ -184,25 +160,15 @@ EXTRA_DIST =
+@@ -184,25 +157,14 @@ EXTRA_DIST =
  	crack.pl                           			\
  	crack.param                        			\
  	laplacian.param                    			\
@@ -102,7 +102,7 @@ Index: getfem/tests/Makefile.am
 -	elastostatic.param                 			\
  	stokes.param                       			\
 -	nonlinear_elastostatic.pl          			\
- 	nonlinear_membrane.pl              			\
+-	nonlinear_membrane.pl              			\
  	nonlinear_membrane.param           			\
 -	plasticity.pl                      			\
 -	plasticity.param                      			\
@@ -112,10 +112,10 @@ Index: getfem/tests/Makefile.am
  	geo_trans_inv.param                			\
  	heat_equation.pl                   			\
  	heat_equation.param                			\
-Index: getfem/contrib/level_set_contact/Makefile.am
+Index: getfem-5.2/contrib/level_set_contact/Makefile.am
 ===================================================================
---- getfem.orig/contrib/level_set_contact/Makefile.am
-+++ getfem/contrib/level_set_contact/Makefile.am
+--- getfem-5.2.orig/contrib/level_set_contact/Makefile.am
++++ getfem-5.2/contrib/level_set_contact/Makefile.am
 @@ -30,7 +30,7 @@ test_contact_SOURCES = contact_problem.c
  AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
  LDADD    = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@
@@ -125,10 +125,10 @@ Index: getfem/contrib/level_set_contact/Makefile.am
  
  EXTRA_DIST = \
  	contact_problem.pl              \
-Index: getfem/contrib/static_contact_gears/Makefile.am
+Index: getfem-5.2/contrib/static_contact_gears/Makefile.am
 ===================================================================
---- getfem.orig/contrib/static_contact_gears/Makefile.am
-+++ getfem/contrib/static_contact_gears/Makefile.am
+--- getfem-5.2.orig/contrib/static_contact_gears/Makefile.am
++++ getfem-5.2/contrib/static_contact_gears/Makefile.am
 @@ -32,7 +32,7 @@ static_contact_gears_u1_u2_SOURCES = sta
  AM_CPPFLAGS = -I$(top_srcdir)/src -I../../src
  LDADD    = ../../src/libgetfem.la -lm @SUPLDFLAGS@ @BOOST_LIBS@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getfem.git