[SCM] FreeFem++ packaging branch, master, updated. debian/3.19.1-1-6-g12eb44c

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Thu Oct 18 18:11:54 UTC 2012


The following commit has been merged in the master branch:
commit 4ac34dda04ddc7738a0eb259683ec8ba5b259bb0
Merge: d4b3b9d88760e62c6fe97256003ae048b94a2475 d5128191b395a3def32bf92fc46ceb3e6beeedb6
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Thu Oct 18 14:36:39 2012 +0300

    Merge tag 'upstream/3.20'
    
    Upstream version 3.20
    
    Conflicts:
    	DOC/freefem++doc.pdf
    	download/gmm/cxxflags
    	examples++-load/all.edp

diff --combined debian/changelog
index 0970be5,0000000..f627699
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,84 -1,0 +1,90 @@@
++freefem++ (3.20-1) unstable; urgency=low
++
++  * New upstream release.
++
++ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Thu, 18 Oct 2012 14:14:12 +0300
++
 +freefem++ (3.19.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Make debian/compat=9.
 +  * Make debhelper (>= 9~) in Build-Depends in debian/control.
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Sun, 03 Jun 2012 22:16:18 +0300
 +
 +freefem++ (3.19-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Add libmumps-seq-dev to build-deps.
 +  * Update standards version to 3.9.3.
 +  * Fix FTBFS due to new g++-4.7 (Closes: #672612).
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Sun, 12 May 2012 03:59:00 +0200
 +
 +freefem++ (3.18.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Create new patch for documentation build.
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Fri, 17 Feb 2012 21:29:00 +0200
 +
 +freefem++ (3.18-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Sat, 4 Feb 2012 21:10:00 +0200
 +
 +freefem++ (3.17-2) unstable; urgency=low
 +
 +  * Fix build failure on hurd-i386 architecture.
 +  * Rename kfreebsd.patch to examples++-load-load-link-in.patch and ammend it.
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Thu, 29 Dec 2011 16:31:00 +0200
 +
 +freefem++ (3.17-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Add build-deps for libgmm++-dev.
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Sun, 27 Nov 2011 14:17:00 +0200
 +
 +freefem++ (3.14-1) unstable; urgency=low
 +
 +  * Add build-deps for mumps_ptscotch, mumps_scotch and hypre.
 +  * Change build-dep libfltk1.1-dev to libfltk1.3-dev | libfltk-dev in debian/
 +    control file.
 +  * New upstream release.
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Wed, 14 Sep 2011 19:11:00 +0300
 +
 +freefem++ (3.13.3-1) unstable; urgency=low
 +
 +  * Add patch for the location of file freefem++.pref.
 +  * New upstream release.
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Tue, 9 Aug 2011 15:31:00 +0300
 +
 +freefem++ (3.13.2-1) unreleased; urgency=low
 +
 +  * Revert to gcc-4.6 for building.
 +  * New upstream release.
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Sun, 3 Jul 2011 21:51:00 +0300
 +
 +freefem++ (3.13-2) unstable; urgency=low
 +
 +  * Change build-dep from openmpi-bin to mpi-default-dev to effect build on 
 +    more arches.
 +  * Apply patch kfreebsd.patch to fix build failure on kfreebsd arches.
 +  * Rename /usr/bin/bamg to /usr/bin/ffbamg to fix double occurence of the 
 +    former, in both rheolef and freefem++ packages (Closes: #630864).
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Mon, 20 Jun 2011 23:00:00 +0200
 +
 +freefem++ (3.13-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #500755).
 +  * Built with gcc-4.5 (see bug report 49264 submitted to the gcc bugzilla 
 +    upstream).
 +
 + -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Mon, 13 Jun 2011 11:10:00 +0200
diff --combined examples++-load/all.edp
index e27ffd7,ac73a52..5f677cd
--- a/examples++-load/all.edp
+++ b/examples++-load/all.edp
@@@ -15,6 -15,14 +15,10 @@@ verbosity=verbosityy
  verbosity=verbosityy;
  { include "APk-MetricPk.edp";};
   cout << "------------------------------------------------------------------------------ " << endl;
 - cout << "--------- file : IPOTest.edp --------------------------------------------------------" << endl;
 -verbosity=verbosityy;
 -{ include "IPOTest.edp";};
 - cout << "------------------------------------------------------------------------------ " << endl;
+  cout << "--------- file : IpOptMinSurf.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;
+ { include "IpOptMinSurf.edp";};
+  cout << "------------------------------------------------------------------------------ " << endl;
   cout << "--------- file : IpoptLap.edp --------------------------------------------------------" << endl;
  verbosity=verbosityy;
  { include "IpoptLap.edp";};
@@@ -31,6 -39,10 +35,6 @@@ verbosity=verbosityy
  verbosity=verbosityy;
  { include "IpoptVI2.edp";};
   cout << "------------------------------------------------------------------------------ " << endl;
 - cout << "--------- file : IsoSurfVol.edp --------------------------------------------------------" << endl;
 -verbosity=verbosityy;
 -{ include "IsoSurfVol.edp";};
 - cout << "------------------------------------------------------------------------------ " << endl;
   cout << "--------- file : LapDG3.edp --------------------------------------------------------" << endl;
  verbosity=verbosityy;
  { include "LapDG3.edp";};
@@@ -39,10 -51,22 +43,10 @@@
  verbosity=verbosityy;
  { include "LapDG4.edp";};
   cout << "------------------------------------------------------------------------------ " << endl;
 - cout << "--------- file : LapLNewSolver.edp --------------------------------------------------------" << endl;
 -verbosity=verbosityy;
 -{ include "LapLNewSolver.edp";};
 - cout << "------------------------------------------------------------------------------ " << endl;
   cout << "--------- file : LapMUMPS_seq.edp --------------------------------------------------------" << endl;
  verbosity=verbosityy;
  { include "LapMUMPS_seq.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";};
@@@ -59,13 -83,21 +63,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;
 -verbosity=verbosityy;
 -{ include "SuperLU.edp";};
 - cout << "------------------------------------------------------------------------------ " << endl;
 - cout << "--------- file : VIJumpP2sparse.edp --------------------------------------------------------" << endl;
 + cout << "--------- file : SuperLu.edp --------------------------------------------------------" << endl;
  verbosity=verbosityy;
 -{ include "VIJumpP2sparse.edp";};
 +{ include "SuperLu.edp";};
   cout << "------------------------------------------------------------------------------ " << endl;
   cout << "--------- file : VarIneq2.edp --------------------------------------------------------" << endl;
  verbosity=verbosityy;
@@@ -75,6 -107,18 +79,6 @@@
  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";};
@@@ -87,6 -131,10 +91,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";};
@@@ -107,26 -155,58 +111,30 @@@ 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 : gsl1.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;
+ { include "gsl1.edp";};
+  cout << "------------------------------------------------------------------------------ " << endl;
   cout << "--------- file : ilut.edp --------------------------------------------------------" << endl;
  verbosity=verbosityy;
  { include "ilut.edp";};
   cout << "------------------------------------------------------------------------------ " << endl;
 - cout << "--------- file : isoline.edp --------------------------------------------------------" << endl;
 -verbosity=verbosityy;
 -{ include "isoline.edp";};
 - cout << "------------------------------------------------------------------------------ " << endl;
   cout << "--------- file : lame-TD-NSS.edp --------------------------------------------------------" << endl;
  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";};
@@@ -151,10 -231,22 +159,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";};
@@@ -163,6 -255,10 +171,10 @@@
  verbosity=verbosityy;
  { include "scotch.edp";};
   cout << "------------------------------------------------------------------------------ " << endl;
+  cout << "--------- file : shell.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;
+ { include "shell.edp";};
+  cout << "------------------------------------------------------------------------------ " << endl;
   cout << "--------- file : splitedges.edp --------------------------------------------------------" << endl;
  verbosity=verbosityy;
  { include "splitedges.edp";};
@@@ -179,6 -275,10 +191,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";};
@@@ -187,6 -287,14 +199,6 @@@
  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";};
@@@ -199,6 -307,18 +211,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";};

-- 
FreeFem++ packaging



More information about the debian-science-commits mailing list