[freefempp] 17/23: Apply Cristoph's examples++-mpi.patch
Dimitrios Eftaxiopoulos
eftaxiop-guest at alioth.debian.org
Wed Sep 11 21:37:12 UTC 2013
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch eftaxiop
in repository freefempp.
commit 7106bcf53562e49ea3dfc4a435653e1cebd03221
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Tue Sep 10 17:52:07 2013 +0300
Apply Cristoph's examples++-mpi.patch
---
debian/patches/examples++-mpi.patch | 36 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
src/fflib/strversionnumber.cpp | 4 ++--
3 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/debian/patches/examples++-mpi.patch b/debian/patches/examples++-mpi.patch
new file mode 100644
index 0000000..25ec639
--- /dev/null
+++ b/debian/patches/examples++-mpi.patch
@@ -0,0 +1,36 @@
+Correct location of pastix, hips and metis header files
+--- a/examples++-mpi/hips_FreeFem.cpp
++++ b/examples++-mpi/hips_FreeFem.cpp
+@@ -45,8 +45,8 @@
+ #endif
+
+ extern "C" {
+-#include "hips.h"
+-#include "metis.h"
++#include "hips/hips.h"
++#include "metis/metis.h"
+ }
+ #include <stdio.h>
+ #include <stdlib.h>
+--- a/examples++-mpi/complex_pastix_FreeFem.cpp
++++ b/examples++-mpi/complex_pastix_FreeFem.cpp
+@@ -55,7 +55,7 @@
+ #include <sys/time.h>
+
+
+-#include "pastix_long_complex.h"
++#include "pastix/pastix_long_complex.h"
+
+ #undef memFree_null
+ #define memFree_null(x) {if (x ==NULL) {fprintf(stdout,"%s:%d freeing NULL\n",__FILE__,__LINE__);} free(x); x=NULL;}
+--- a/examples++-mpi/real_pastix_FreeFem.cpp
++++ b/examples++-mpi/real_pastix_FreeFem.cpp
+@@ -76,7 +76,7 @@
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-#include "pastix.h"
++#include "pastix/pastix.h"
+ //#include "cscd_utils.h"
+ #ifdef __cplusplus
+ }
diff --git a/debian/patches/series b/debian/patches/series
index eeeca8c..7dcaf43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+examples++-mpi.patch
examples++-load.patch
configure.patch
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 77322b5..9781452 100644
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@ -18,6 +18,6 @@ string StrVersionNumber(){
// buffer.precision(8);
// buffer<<VersionNumber();
static char buffer[100];
- sprintf(buffer," %9f (date Τρι 10 Σεπ 2013 05:36:32 μμ EEST)",VersionNumber());
- return buffer; //.str()+" (date Τρι 10 Σεπ 2013 05:36:32 μμ EEST)" ;
+ sprintf(buffer," %9f (date Τρι 10 Σεπ 2013 05:46:51 μμ EEST)",VersionNumber());
+ return buffer; //.str()+" (date Τρι 10 Σεπ 2013 05:46:51 μμ EEST)" ;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git
More information about the debian-science-commits
mailing list