[freefempp] 18/23: Patch examples++-load/Makefile.am to locate *.so and *.idp files

[Dimitrios Eftaxiopoulos]

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

eftaxiop-guest pushed a commit to branch eftaxiop
in repository freefempp.

commit 4f1cc0919e5c9ffd8f20ec5e37dd7e0d58f12d75
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Tue Sep 10 18:28:56 2013 +0300

    Patch examples++-load/Makefile.am to locate *.so and *.idp files
---
 debian/patches/examples++-load.patch |   31 ++++++++++++++++++++-----------
 src/fflib/strversionnumber.cpp       |    4 ++--
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/debian/patches/examples++-load.patch b/debian/patches/examples++-load.patch
index 89ae944..8cd154c 100644
--- a/debian/patches/examples++-load.patch
+++ b/debian/patches/examples++-load.patch
@@ -14,17 +14,6 @@ Add ability to compile freefem++ with Ipopt, freeyams, mmg3d_v4, mshmet, mumps_s
  
  //using namespace std;
  #include "IpTNLP.hpp"
---- a/examples++-load/MUMPS_seq.cpp
-+++ b/examples++-load/MUMPS_seq.cpp
-@@ -38,7 +38,7 @@
- 
- #include "ff++.hpp"
- 
--#include "mpi.h"
-+#include "mumps_seq/mpi.h"
- #include "dmumps_c.h"
- #include "zmumps_c.h"
- 
 --- a/examples++-load/mmg3d-v4.0.cpp
 +++ b/examples++-load/mmg3d-v4.0.cpp
 @@ -10,7 +10,7 @@
@@ -70,3 +59,23 @@ Add ability to compile freefem++ with Ipopt, freeyams, mmg3d_v4, mshmet, mumps_s
  //ff-c++-cpp-dep: 
  //  
  
+--- a/examples++-load/Makefile.am
++++ b/examples++-load/Makefile.am
+@@ -1,5 +1,5 @@
+ all-local: @LOAD_COMPILE@
+-TESTS=APk-AdaptEpsDeltaPk.edp APk-ExplicitPkTest.edp APk-FreeFemQA.edp APk-MetricPk.edp IPOTest.edp IpOptMinSurf.edp IpoptLap.edp IpoptMinSurfVol.edp IpoptVI.edp IpoptVI2.edp LapDG3.edp LapDG4.edp LapLNewSolver.edp LapMUMPS_seq.edp LapNewSolver.edp LapUmfpack64.edp LaplaceP3.edp LaplaceP4.edp LaplaceRT1.edp Leman-mesh.edp MetricKuate.edp NSP2BRP0.edp PARDISO.edp SuperLU.edp VarIneq2.edp  bilapMorley.edp bmo.edp buildlayermesh.edp checkglumeshcube.edp cmaes-VarIneq.edp cmaes-oven.edp con [...]
++TESTS=APk-AdaptEpsDeltaPk.edp APk-ExplicitPkTest.edp APk-FreeFemQA.edp APk-MetricPk.edp IPOTest.edp IpOptMinSurf.edp IpoptLap.edp IpoptMinSurfVol.edp IpoptVI.edp IpoptVI2.edp LapDG3.edp LapDG4.edp LapLNewSolver.edp LapMUMPS_seq.edp LapNewSolver.edp LapUmfpack64.edp LaplaceP3.edp LaplaceP4.edp LaplaceRT1.edp Leman-mesh.edp MetricKuate.edp NSP2BRP0.edp PARDISO.edp SuperLU.edp VarIneq2.edp bilapMorley.edp bmo.edp buildlayermesh.edp checkglumeshcube.edp cmaes-VarIneq.edp cmaes-oven.edp conv [...]
+ # all test can fail must but clean ????  FH... 
+ XFAIL_TESTS=$(TESTS)
+ 
+@@ -198,8 +198,8 @@
+ 	$(INSTALL_DATA)  clapack.h ppmimg.h  bmo.hpp msh3.hpp pcm.hpp  include/*   $(DESTDIR)$(ff_prefix_dir)/include
+ 	$(INSTALL)  -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
+ 	echo loadpath += \"./\"  >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+-	echo loadpath += \"$(ff_prefix_dir)/lib\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+-	echo includepath += \"$(ff_prefix_dir)/idp\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
++	echo loadpath += \"$(prefix)/lib/freefem++\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
++	echo includepath += \"$(prefix)/include/freefem++/idp\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ 	$(INSTALL_SCRIPT) ff-c++  $(DESTDIR)${bindir}
+ 	$(INSTALL_SCRIPT) ff-pkg-download  $(DESTDIR)${bindir}
+ 	$(INSTALL_SCRIPT) ff-get-dep  $(DESTDIR)${bindir}
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 9781452..82e1142 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:46:51 μμ EEST)",VersionNumber());
-  return buffer; //.str()+" (date Τρι 10 Σεπ 2013 05:46:51 μμ EEST)" ;
+  sprintf(buffer," %9f (date Τρι 10 Σεπ 2013 06:23:21 μμ EEST)",VersionNumber());
+  return buffer; //.str()+" (date Τρι 10 Σεπ 2013 06:23:21 μμ EEST)" ;
 }

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