[getfem] 02/11: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Mon Aug 14 22:09:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to annotated tag debian/5.2+dfsg1-1
in repository getfem.
commit 1b52fd2aa7bcfc0676a88af09ab844c02858b8d6
Author: Anton Gladky <gladk at debian.org>
Date: Mon Aug 14 21:22:31 2017 +0200
Refresh patches.
---
debian/patches/04_fix_FTBFS.patch | 6 ++--
debian/patches/05_disable_failing_test.patch | 27 ++++++-----------
debian/patches/06_gcc-6.patch | 12 ++++----
debian/patches/07_disable_scilab.patch | 44 ++++++++--------------------
4 files changed, 31 insertions(+), 58 deletions(-)
diff --git a/debian/patches/04_fix_FTBFS.patch b/debian/patches/04_fix_FTBFS.patch
index 4d2783f..923cf37 100644
--- a/debian/patches/04_fix_FTBFS.patch
+++ b/debian/patches/04_fix_FTBFS.patch
@@ -2,10 +2,10 @@ Description: Fix FTBFS
Author: Anton Gladky <gladk at debian.org>
Last-Update: <2016-04-15>
-Index: getfem-5.1/interface/src/gf_asm.cc
+Index: getfem-5.2/interface/src/gf_asm.cc
===================================================================
---- getfem-5.1.orig/interface/src/gf_asm.cc
-+++ getfem-5.1/interface/src/gf_asm.cc
+--- getfem-5.2.orig/interface/src/gf_asm.cc
++++ getfem-5.2/interface/src/gf_asm.cc
@@ -218,7 +218,7 @@ void asm_stabilization_patch_matrix
int nparts = 1;
diff --git a/debian/patches/05_disable_failing_test.patch b/debian/patches/05_disable_failing_test.patch
index 07c9e8d..ec11354 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
-@@ -28,22 +28,15 @@ check_PROGRAMS = \
+--- getfem-5.2.orig/tests/Makefile.am
++++ getfem-5.2/tests/Makefile.am
+@@ -45,22 +45,15 @@ check_PROGRAMS = \
test_interpolated_fem \
test_range_basis \
laplacian \
@@ -30,7 +30,7 @@ Index: getfem/tests/Makefile.am
CLEANFILES = \
laplacian.res laplacian.mesh laplacian.dataelt \
-@@ -65,14 +58,9 @@ test_kdtree_SOURCES = test_kdtree.cc
+@@ -82,14 +75,9 @@ test_kdtree_SOURCES = test_kdtree.cc
test_rtree_SOURCES = test_rtree.cc
test_assembly_SOURCES = test_assembly.cc
laplacian_SOURCES = laplacian.cc
@@ -45,7 +45,7 @@ Index: getfem/tests/Makefile.am
integration_SOURCES = integration.cc
poly_SOURCES = poly.cc
test_mesh_SOURCES = test_mesh.cc
-@@ -91,7 +79,6 @@ test_mesh_im_level_set_SOURCES = test_me
+@@ -108,7 +96,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
-@@ -120,21 +107,13 @@ TESTS = \
+@@ -137,21 +124,13 @@ TESTS = \
test_interpolated_fem.pl \
test_range_basis.pl \
laplacian.pl \
@@ -75,7 +75,7 @@ Index: getfem/tests/Makefile.am
cyl_slicer.pl \
make_gmm_test.pl
-@@ -147,10 +126,7 @@ EXTRA_DIST =
+@@ -164,10 +143,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 \
-@@ -167,25 +143,15 @@ EXTRA_DIST =
+@@ -184,25 +160,15 @@ EXTRA_DIST =
crack.pl \
crack.param \
laplacian.param \
@@ -112,12 +112,3 @@ Index: getfem/tests/Makefile.am
geo_trans_inv.param \
heat_equation.pl \
heat_equation.param \
-Index: getfem/contrib/Makefile.am
-===================================================================
---- getfem.orig/contrib/Makefile.am
-+++ getfem/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 \
-- 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 511f732..4d686ec 100644
--- a/debian/patches/06_gcc-6.patch
+++ b/debian/patches/06_gcc-6.patch
@@ -2,10 +2,10 @@ Description: Fix FTBFS with gcc-6
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-08-08
-Index: getfem-5.1/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
+Index: getfem-5.2/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
+--- getfem-5.2.orig/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
++++ getfem-5.2/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
@@ -43,7 +43,7 @@
#include "getfem/getfem_interpolated_fem.h"
@@ -15,10 +15,10 @@ Index: getfem-5.1/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
/* some GetFEM++ types that we will be using */
-Index: getfem-5.1/contrib/bimaterial_crack_test/crack_exact_solution.h
+Index: getfem-5.2/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
+--- getfem-5.2.orig/contrib/bimaterial_crack_test/crack_exact_solution.h
++++ getfem-5.2/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 e4d3c3c..d0da6cc 100644
--- a/debian/patches/07_disable_scilab.patch
+++ b/debian/patches/07_disable_scilab.patch
@@ -2,29 +2,11 @@ Description: Disable scilab
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-08-08
-Index: getfem++-5.1+dfsg1/interface/src/Makefile.am
+Index: getfem-5.2/m4/Makefile.in
===================================================================
---- 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
-
--if BUILDSCILAB
--subdirSCILAB=scilab
--.NOTPARALLEL: scilab
--endif
--
--SUBDIRS = . $(subdirMATLAB) $(subdirPYTHON) $(subdirSCILAB)
-+SUBDIRS = . $(subdirMATLAB) $(subdirPYTHON)
-
- RPC_INC_DIR=@RPC_INC_DIR@
-
-Index: getfem++-5.1+dfsg1/m4/Makefile.in
-===================================================================
---- 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
+--- getfem-5.2.orig/m4/Makefile.in
++++ getfem-5.2/m4/Makefile.in
+@@ -109,7 +109,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 \
@@ -32,8 +14,8 @@ Index: getfem++-5.1+dfsg1/m4/Makefile.in
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-@@ -173,12 +173,9 @@ FC = @FC@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -180,12 +180,9 @@ FC = @FC@
FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FGREP = @FGREP@
@@ -46,7 +28,7 @@ Index: getfem++-5.1+dfsg1/m4/Makefile.in
IM_METHODS = @IM_METHODS@
IM_METHODS_LOC = @IM_METHODS_LOC@
INSTALL = @INSTALL@
-@@ -242,13 +239,6 @@ QHULL_LIBS = @QHULL_LIBS@
+@@ -250,13 +247,6 @@ QHULL_LIBS = @QHULL_LIBS@
RANLIB = @RANLIB@
RPC_INC_DIR = @RPC_INC_DIR@
RPC_LIB = @RPC_LIB@
@@ -60,7 +42,7 @@ Index: getfem++-5.1+dfsg1/m4/Makefile.in
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-@@ -286,7 +276,6 @@ datarootdir = @datarootdir@
+@@ -294,7 +284,6 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -68,11 +50,11 @@ Index: getfem++-5.1+dfsg1/m4/Makefile.in
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-Index: getfem++-5.1+dfsg1/configure.ac
+Index: getfem-5.2/configure.ac
===================================================================
---- getfem++-5.1+dfsg1.orig/configure.ac
-+++ getfem++-5.1+dfsg1/configure.ac
-@@ -971,43 +971,6 @@ fi
+--- getfem-5.2.orig/configure.ac
++++ getfem-5.2/configure.ac
+@@ -1045,43 +1045,6 @@ fi
AM_CONDITIONAL(BUILDPYTHON, test x$usepython = xYES)
AM_CONDITIONAL(BUILDPYTHONPAR, test x$ac_python_mpi4py = xYES)
@@ -116,7 +98,7 @@ Index: getfem++-5.1+dfsg1/configure.ac
dnl -----------------------------------------------
dnl Outputs
-@@ -1047,8 +1010,6 @@ interface/src/matlab/Makefile
+@@ -1122,8 +1085,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
More information about the debian-science-commits
mailing list