[getfem] 02/03: Update patches.

[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 45e2e84d5b76d54ab0a6a0410d85a578d72fe482
Author: Anton Gladky <gladk at debian.org>
Date:   Thu May 1 22:49:26 2014 +0200

    Update patches.
---
 debian/patches/01_link_boost-system.patch | 33 -------------------------------
 debian/patches/04_fix_FTBFS.patch         | 15 ++++++++++++++
 debian/patches/series                     |  2 +-
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/debian/patches/01_link_boost-system.patch b/debian/patches/01_link_boost-system.patch
deleted file mode 100644
index 9d51ffb..0000000
--- a/debian/patches/01_link_boost-system.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -221,7 +221,7 @@
- lib_LTLIBRARIES = libgetfem.la
- libgetfem_la_SOURCES = $(SRC)
- libgetfem_la_LDFLAGS = ${LIBTOOL_VERSION_INFO}
--libgetfem_la_LIBADD = @SUPERLU_LIBS@ @MUMPS_LIBS@
-+libgetfem_la_LIBADD = @SUPERLU_LIBS@ @MUMPS_LIBS@ -lboost_system
- AM_CPPFLAGS = -I$(top_srcdir)/src -I../src -I$(top_srcdir)
- 
- CLEANFILES = ii_files/* *.o.d
---- a/tests-2.0/Makefile.am
-+++ b/tests-2.0/Makefile.am
-@@ -79,7 +79,7 @@
- 
- SUPLDFLAGS = @SUPLDFLAGS@
- AM_CPPFLAGS = -I$(top_srcdir)/src -I../src
--LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS)
-+LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS) -lboost_system
- 
- #plasticity_LDADD = ../src/libgetfem.la -lm @SUPLDFLAGS@ $(HOME)/source++/SuperLU/superlu.a -lblas -lg2c
- #plasticity_INCLUDES = $(INCLUDES) -I$(HOME)/source++/SuperLU/
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -105,7 +105,7 @@
- 
- SUPLDFLAGS = @SUPLDFLAGS@
- AM_CPPFLAGS = -I$(top_srcdir)/src -I../src
--LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS)
-+LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS) -lboost_system
- 
- TESTS = \
- 	$(abs_top_srcdir)/tests/dynamic_array.pl              \
diff --git a/debian/patches/04_fix_FTBFS.patch b/debian/patches/04_fix_FTBFS.patch
new file mode 100644
index 0000000..e7bc392
--- /dev/null
+++ b/debian/patches/04_fix_FTBFS.patch
@@ -0,0 +1,15 @@
+Description: Fix FTBFS
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: <2014-05-01>
+
+--- getfem++-4.2.1~beta1~svn4635~dfsg.orig/interface/src/gf_asm.cc
++++ getfem++-4.2.1~beta1~svn4635~dfsg/interface/src/gf_asm.cc
+@@ -215,7 +215,7 @@ void asm_stabilization_patch_matrix
+ 
+   int nparts = 1;
+ #ifdef GETFEM_HAVE_METIS
+-  nparts = int(size_of_crack/(ratio_size*h));
++  nparts = int(size_of_crack/(ratio_size));
+ # 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;
diff --git a/debian/patches/series b/debian/patches/series
index 7cb9159..4e3e6b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-01_link_boost-system.patch
 02_addgetfempath.diff
 03_disableXaccess.diff
+04_fix_FTBFS.patch

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