[getfem] 02/04: Refresh patches.

Tue Aug 23 18:47:15 UTC 2016

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

gladk pushed a commit to branch master
in repository getfem.

commit 32cbff8958352babc4a5783488d6b9a6fc6689e6
Author: Anton Gladky <gladk at debian.org>
Date:   Tue Aug 23 20:42:06 2016 +0200

    Refresh patches.
---
 debian/patches/04_fix_FTBFS.patch            | 20 ++--------
 debian/patches/05_disable_failing_test.patch | 16 ++++----
 debian/patches/06_gcc-6.patch                | 12 ++++--
 debian/patches/07_disable_scilab.patch       | 56 +++++++++++++++++++++-------
 4 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/debian/patches/04_fix_FTBFS.patch b/debian/patches/04_fix_FTBFS.patch
index ea0bd12..4d2783f 100644
--- a/debian/patches/04_fix_FTBFS.patch
+++ b/debian/patches/04_fix_FTBFS.patch
@@ -2,11 +2,11 @@ Description: Fix FTBFS
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: <2016-04-15>
 
-Index: getfem-5.0/interface/src/gf_asm.cc
+Index: getfem-5.1/interface/src/gf_asm.cc
 ===================================================================
---- getfem-5.0.orig/interface/src/gf_asm.cc
-+++ getfem-5.0/interface/src/gf_asm.cc
-@@ -219,7 +219,7 @@ void asm_stabilization_patch_matrix
+--- getfem-5.1.orig/interface/src/gf_asm.cc
++++ getfem-5.1/interface/src/gf_asm.cc
+@@ -218,7 +218,7 @@ void asm_stabilization_patch_matrix
  
    int nparts = 1;
  #ifdef GETFEM_HAVE_METIS
@@ -15,15 +15,3 @@ Index: getfem-5.0/interface/src/gf_asm.cc
  # ifdef GETFEM_HAVE_METIS_OLD_API
    std::vector<int> adjwgt(k); // actually Metis would also accept NULL instead of an empty array
    int wgtflag = 2, numflag = 0, edgecut;
-Index: getfem-5.0/contrib/xfem_contact/xfem_dirichlet.cc
-===================================================================
---- getfem-5.0.orig/contrib/xfem_contact/xfem_dirichlet.cc
-+++ getfem-5.0/contrib/xfem_contact/xfem_dirichlet.cc
-@@ -32,7 +32,6 @@
- #include "getfem/getfem_model_solvers.h"
- #include "getfem/getfem_mesh_im_level_set.h"
- #include "getfem/getfem_partial_mesh_fem.h"
--#include "getfem/getfem_Coulomb_friction.h"
- #include "getfem/getfem_import.h"
- #include "getfem/getfem_inter_element.h"
- #include "gmm/gmm.h"
diff --git a/debian/patches/05_disable_failing_test.patch b/debian/patches/05_disable_failing_test.patch
index a3db5f5..89a601b 100644
--- a/debian/patches/05_disable_failing_test.patch
+++ b/debian/patches/05_disable_failing_test.patch
@@ -2,10 +2,10 @@ Description: Disable two failing tests
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2016-08-13
 
-Index: getfem/tests/Makefile.am
+Index: getfem++-5.1+dfsg1/tests/Makefile.am
 ===================================================================
---- getfem.orig/tests/Makefile.am
-+++ getfem/tests/Makefile.am
+--- getfem++-5.1+dfsg1.orig/tests/Makefile.am
++++ getfem++-5.1+dfsg1/tests/Makefile.am
 @@ -28,8 +28,6 @@ check_PROGRAMS =                   \
  	test_interpolated_fem      \
  	test_range_basis           \
@@ -105,12 +105,12 @@ Index: getfem/tests/Makefile.am
  	geo_trans_inv.param                			\
  	heat_equation.pl                   			\
  	heat_equation.param                			\
-Index: getfem/contrib/Makefile.am
+Index: getfem++-5.1+dfsg1/contrib/Makefile.am
 ===================================================================
---- getfem.orig/contrib/Makefile.am
-+++ getfem/contrib/Makefile.am
+--- getfem++-5.1+dfsg1.orig/contrib/Makefile.am
++++ getfem++-5.1+dfsg1/contrib/Makefile.am
 @@ -1,3 +1,3 @@
  SUBDIRS = icare delaminated_crack aposteriori xfem_stab_unilat_contact      \
  	  bimaterial_crack_test mixed_elastostatic xfem_contact crack_plate \
--	  inter_element_test static_contact_gears level_set_contact
-+	  inter_element_test static_contact_gears
+-	  static_contact_gears level_set_contact test_plasticity
++	  static_contact_gears
diff --git a/debian/patches/06_gcc-6.patch b/debian/patches/06_gcc-6.patch
index 4c0a846..511f732 100644
--- a/debian/patches/06_gcc-6.patch
+++ b/debian/patches/06_gcc-6.patch
@@ -2,8 +2,10 @@ Description: Fix FTBFS with gcc-6
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2016-08-08
 
---- getfem++-5.0.orig/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
-+++ getfem++-5.0/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
+Index: getfem-5.1/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
+===================================================================
+--- getfem-5.1.orig/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
++++ getfem-5.1/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
 @@ -43,7 +43,7 @@
  #include "getfem/getfem_interpolated_fem.h"
  
@@ -13,8 +15,10 @@ Last-Update: 2016-08-08
  
  
  /* some GetFEM++ types that we will be using */
---- getfem++-5.0.orig/contrib/bimaterial_crack_test/crack_exact_solution.h
-+++ getfem++-5.0/contrib/bimaterial_crack_test/crack_exact_solution.h
+Index: getfem-5.1/contrib/bimaterial_crack_test/crack_exact_solution.h
+===================================================================
+--- getfem-5.1.orig/contrib/bimaterial_crack_test/crack_exact_solution.h
++++ getfem-5.1/contrib/bimaterial_crack_test/crack_exact_solution.h
 @@ -32,7 +32,7 @@
  #include "getfem/getfem_mesh_fem_global_function.h"
  
diff --git a/debian/patches/07_disable_scilab.patch b/debian/patches/07_disable_scilab.patch
index 16bba38..e4d3c3c 100644
--- a/debian/patches/07_disable_scilab.patch
+++ b/debian/patches/07_disable_scilab.patch
@@ -2,10 +2,10 @@ Description: Disable scilab
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2016-08-08
 
-Index: getfem/interface/src/Makefile.am
+Index: getfem++-5.1+dfsg1/interface/src/Makefile.am
 ===================================================================
---- getfem.orig/interface/src/Makefile.am
-+++ getfem/interface/src/Makefile.am
+--- getfem++-5.1+dfsg1.orig/interface/src/Makefile.am
++++ getfem++-5.1+dfsg1/interface/src/Makefile.am
 @@ -6,12 +6,7 @@ if BUILDPYTHON
  subdirPYTHON=python
  endif
@@ -20,19 +20,47 @@ Index: getfem/interface/src/Makefile.am
  
  RPC_INC_DIR=@RPC_INC_DIR@
  
-Index: getfem/m4/Makefile.in
+Index: getfem++-5.1+dfsg1/m4/Makefile.in
 ===================================================================
---- getfem.orig/m4/Makefile.in
-+++ getfem/m4/Makefile.in
-@@ -92,7 +92,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+--- getfem++-5.1+dfsg1.orig/m4/Makefile.in
++++ getfem++-5.1+dfsg1/m4/Makefile.in
+@@ -100,7 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
  	$(top_srcdir)/m4/ax_prog_fc_mpi.m4 $(top_srcdir)/m4/libtool.m4 \
  	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
  	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
 -	$(top_srcdir)/m4/scilab.m4 $(top_srcdir)/configure.ac
++	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -275,7 +274,6 @@ datarootdir = @datarootdir@
+ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+@@ -173,12 +173,9 @@ FC = @FC@
+ FCFLAGS = @FCFLAGS@
+ FCLIBS = @FCLIBS@
+ FGREP = @FGREP@
+-GETFEM_BUILD_INTERFACE_PATH = @GETFEM_BUILD_INTERFACE_PATH@
+-GETFEM_INTERFACE_PATH = @GETFEM_INTERFACE_PATH@
+ GETFEM_SERVER = @GETFEM_SERVER@
+ GFSERVERFLAGS = @GFSERVERFLAGS@
+ GREP = @GREP@
+-HAVE_SCILAB = @HAVE_SCILAB@
+ IM_METHODS = @IM_METHODS@
+ IM_METHODS_LOC = @IM_METHODS_LOC@
+ INSTALL = @INSTALL@
+@@ -242,13 +239,6 @@ QHULL_LIBS = @QHULL_LIBS@
+ RANLIB = @RANLIB@
+ RPC_INC_DIR = @RPC_INC_DIR@
+ RPC_LIB = @RPC_LIB@
+-SCILAB_DIR = @SCILAB_DIR@
+-SCILAB_EXE = @SCILAB_EXE@
+-SCILAB_TOOLBOX_DIR = @SCILAB_TOOLBOX_DIR@
+-SCILAB_VERSION = @SCILAB_VERSION@
+-SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
+-SCILAB_VERSION_MICRO = @SCILAB_VERSION_MICRO@
+-SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -286,7 +276,6 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -40,11 +68,11 @@ Index: getfem/m4/Makefile.in
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
-Index: getfem/configure.ac
+Index: getfem++-5.1+dfsg1/configure.ac
 ===================================================================
---- getfem.orig/configure.ac
-+++ getfem/configure.ac
-@@ -977,43 +977,6 @@ fi
+--- getfem++-5.1+dfsg1.orig/configure.ac
++++ getfem++-5.1+dfsg1/configure.ac
+@@ -971,43 +971,6 @@ fi
  AM_CONDITIONAL(BUILDPYTHON, test x$usepython = xYES)
  AM_CONDITIONAL(BUILDPYTHONPAR, test x$ac_python_mpi4py = xYES)
  
@@ -88,7 +116,7 @@ Index: getfem/configure.ac
  
  dnl -----------------------------------------------
  dnl Outputs
-@@ -1053,8 +1016,6 @@ interface/src/matlab/Makefile
+@@ -1047,8 +1010,6 @@ interface/src/matlab/Makefile
  interface/src/matlab/private/Makefile                                   \
  interface/src/python/Makefile                                           \
  interface/src/python/setup.py                                           \

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

