[SCM] FreeFem++ packaging branch, master, updated. debian/3.16-1-22-g182c946
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Sun Nov 27 15:42:07 UTC 2011
The following commit has been merged in the master branch:
commit 182c94692772e7eefe3802574ae55c78743a38d5
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sun Nov 27 17:36:39 2011 +0200
Successful build
diff --git a/DOC/freefem++doc.pdf b/DOC/freefem++doc.pdf
deleted file mode 100644
index 80e35bd..0000000
Binary files a/DOC/freefem++doc.pdf and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index baf041a..752b3a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-freefem++ (3.16-1) unstable; urgency=low
+freefem++ (3.17-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sun, 27 Nov 2011 14:17:00 +0200
+
+freefem++ (3.16-1) unreleased; urgency=low
* New upstream release.
* Add build-deps for libgmm++-dev.
diff --git a/debian/patches/examples++-load-Makefile.patch b/debian/patches/examples++-load-Makefile.patch
index c15d671..483f9cd 100644
--- a/debian/patches/examples++-load-Makefile.patch
+++ b/debian/patches/examples++-load-Makefile.patch
@@ -1,7 +1,19 @@
-Fix finding of file freefem++.pref
+Locate freefem++.pref and ignore nlopt from building
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
-@@ -140,8 +140,7 @@
+@@ -65,9 +65,9 @@
+ isolineP1.$(DYLIB_SUFFIX) thresholdings.$(DYLIB_SUFFIX) \
+ VTK_writer_3d.$(DYLIB_SUFFIX) VTK_writer.$(DYLIB_SUFFIX) \
+ splitedges.$(DYLIB_SUFFIX) Element_Mixte.$(DYLIB_SUFFIX) \
+- myfunction2.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
++ myfunction2.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
+
+-LIST_COMPILE_PKG= tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
++LIST_COMPILE_PKG= tetgen.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
+ metis.$(DYLIB_SUFFIX) UMFPACK64.$(DYLIB_SUFFIX) NewSolver.$(DYLIB_SUFFIX) \
+ lapack.$(DYLIB_SUFFIX) fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
+ freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
+@@ -147,8 +147,7 @@
$(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
@@ -13,7 +25,19 @@ Fix finding of file freefem++.pref
$(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
--- a/examples++-load/Makefile.in
+++ b/examples++-load/Makefile.in
-@@ -716,8 +716,7 @@
+@@ -330,9 +330,9 @@
+ isolineP1.$(DYLIB_SUFFIX) thresholdings.$(DYLIB_SUFFIX) \
+ VTK_writer_3d.$(DYLIB_SUFFIX) VTK_writer.$(DYLIB_SUFFIX) \
+ splitedges.$(DYLIB_SUFFIX) Element_Mixte.$(DYLIB_SUFFIX) \
+- myfunction2.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
++ myfunction2.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
+
+-LIST_COMPILE_PKG = tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
++LIST_COMPILE_PKG = tetgen.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
+ metis.$(DYLIB_SUFFIX) UMFPACK64.$(DYLIB_SUFFIX) NewSolver.$(DYLIB_SUFFIX) \
+ lapack.$(DYLIB_SUFFIX) fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
+ freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
+@@ -724,8 +724,7 @@
$(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
diff --git a/debian/source/options b/debian/source/options
index 83a205c..fd4d061 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
- extend-diff-ignore = "(^|/)(INSTALL|configure|depcomp|install-sh|missing|mkinstalldirs|src/fflib/strversionnumber\.cpp|examples\+\+-load/all\.edp)$"
\ No newline at end of file
+ extend-diff-ignore = "(^|/)(INSTALL|configure|depcomp|install-sh|missing|mkinstalldirs|src/fflib/strversionnumber\.cpp|examples\+\+-load/all\.edp|src/lglib/lg\.output|src/lglib/lg\.tab\.cpp|src/lglib/lg\.tab\.hpp)$"
\ No newline at end of file
diff --git a/download/nlopt/config.log b/download/nlopt/config.log
new file mode 100644
index 0000000..5d92f6d
--- /dev/null
+++ b/download/nlopt/config.log
@@ -0,0 +1,17 @@
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.17, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
diff --git a/examples++-load/Makefile.am b/examples++-load/Makefile.am
index 107c456..c86d60f 100644
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
@@ -65,9 +65,9 @@ LIST_COMPILE=myfunction.$(DYLIB_SUFFIX) BernadiRaugel.$(DYLIB_SUFFIX) \
isolineP1.$(DYLIB_SUFFIX) thresholdings.$(DYLIB_SUFFIX) \
VTK_writer_3d.$(DYLIB_SUFFIX) VTK_writer.$(DYLIB_SUFFIX) \
splitedges.$(DYLIB_SUFFIX) Element_Mixte.$(DYLIB_SUFFIX) \
- myfunction2.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
+ myfunction2.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
-LIST_COMPILE_PKG= tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
+LIST_COMPILE_PKG= tetgen.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
metis.$(DYLIB_SUFFIX) UMFPACK64.$(DYLIB_SUFFIX) NewSolver.$(DYLIB_SUFFIX) \
lapack.$(DYLIB_SUFFIX) fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
@@ -147,8 +147,7 @@ install-exec-local:: load_compile
$(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 += \"$(libdir)/freefem++\" >>$(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/examples++-load/Makefile.in b/examples++-load/Makefile.in
index 5d058af..d1cfc96 100644
--- a/examples++-load/Makefile.in
+++ b/examples++-load/Makefile.in
@@ -330,9 +330,9 @@ LIST_COMPILE = myfunction.$(DYLIB_SUFFIX) BernadiRaugel.$(DYLIB_SUFFIX) \
isolineP1.$(DYLIB_SUFFIX) thresholdings.$(DYLIB_SUFFIX) \
VTK_writer_3d.$(DYLIB_SUFFIX) VTK_writer.$(DYLIB_SUFFIX) \
splitedges.$(DYLIB_SUFFIX) Element_Mixte.$(DYLIB_SUFFIX) \
- myfunction2.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
+ myfunction2.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
-LIST_COMPILE_PKG = tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
+LIST_COMPILE_PKG = tetgen.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
metis.$(DYLIB_SUFFIX) UMFPACK64.$(DYLIB_SUFFIX) NewSolver.$(DYLIB_SUFFIX) \
lapack.$(DYLIB_SUFFIX) fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
@@ -724,8 +724,7 @@ install-exec-local:: load_compile
$(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 += \"$(libdir)/freefem++\" >>$(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/examples++-load/all.edp b/examples++-load/all.edp
index 6760bf5..42fe198 100644
--- a/examples++-load/all.edp
+++ b/examples++-load/all.edp
@@ -7,18 +7,6 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "LapDG4.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : LapLNewSolver.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "LapLNewSolver.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : LapNewSolver.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "LapNewSolver.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : LapUmfpack64.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "LapUmfpack64.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : LaplaceP3.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "LaplaceP3.edp";};
@@ -35,17 +23,13 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "Leman-mesh.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : MetricKuate.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "MetricKuate.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : NSP2BRP0.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "NSP2BRP0.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : SuperLU.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : SuperLu.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
-{ include "SuperLU.edp";};
+{ include "SuperLu.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : VarIneq2.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
@@ -55,18 +39,6 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "bilapMorley.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : bmo.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "bmo.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : buildlayermesh.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "buildlayermesh.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : checkglumeshcube.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "checkglumeshcube.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : cmaes-VarIneq.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "cmaes-VarIneq.edp";};
@@ -79,10 +51,6 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "convect_dervieux.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : convectchacon-3d.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "convectchacon-3d.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : convectchacon.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "convectchacon.edp";};
@@ -103,14 +71,6 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "funcTemplate.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : glumesh3D.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "glumesh3D.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : gsl.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "gsl.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : ilut.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "ilut.edp";};
@@ -119,34 +79,18 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "lame-TD-NSS.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : lap-solvers.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "lap-solvers.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : lapack.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "lapack.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : layer.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "layer.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : load.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "load.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "meditddm.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : metis.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "metis.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : mshmet.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "mshmet.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : myType.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "myType.edp";};
@@ -171,22 +115,10 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "plot-fb-P4dc.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : plotfb.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "plotfb.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : ppm2rnm.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "ppm2rnm.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : provadxw.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "provadxw.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : refinesphere.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "refinesphere.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : schwarz-nm.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "schwarz-nm.edp";};
@@ -207,10 +139,6 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "test-ElementMixte.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : testFE-P13ddc.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "testFE-P13ddc.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : testFE-P3.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "testFE-P3.edp";};
@@ -219,14 +147,6 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "testFE-P3dc.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : testFE-P4.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "testFE-P4.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : testFE-P4dc.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "testFE-P4dc.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : testFE-PkEdge.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "testFE-PkEdge.edp";};
@@ -239,18 +159,6 @@ verbosity=verbosityy;
verbosity=verbosityy;
{ include "testFEMorley.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : tetgencube.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "tetgencube.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : tetgenholeregion.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "tetgenholeregion.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : tetgenholeregion_rugby.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "tetgenholeregion_rugby.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : thresholdings.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;
{ include "thresholdings.edp";};
diff --git a/examples++-mpi/cmaes.o b/examples++-mpi/cmaes.o
new file mode 100644
index 0000000..191caf7
Binary files /dev/null and b/examples++-mpi/cmaes.o differ
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list