[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.5.1_beta2_svn12143_dfsg-2-5-g2b96fea

[Anton Gladky]

The following commit has been merged in the master branch:
commit a5d25f5cdddc29af3d921c5d4cc52a43f3b3cd49
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jun 14 22:27:46 2012 +0200

    Remove patch, applied by upstream.

diff --git a/debian/patches/fix_FTBFS_gcc-4.7_bamg.patch b/debian/patches/fix_FTBFS_gcc-4.7_bamg.patch
deleted file mode 100644
index e8ad108..0000000
--- a/debian/patches/fix_FTBFS_gcc-4.7_bamg.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Description: Fix FTBFS against gcc-4.7
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-05-24
-
---- a/contrib/bamg/bamglib/Mesh2.cpp
-+++ b/contrib/bamg/bamglib/Mesh2.cpp
-@@ -3201,7 +3201,7 @@
-   if (inbvx) {
-     vertices=new Vertex[nbvx];
-     assert(vertices);
--    ordre=new (Vertex* [nbvx]);
-+    ordre=new (Vertex* [this->nbvx]);
-     assert(ordre);
-     triangles=new Triangle[nbtx];
-     assert(triangles);}
-@@ -3977,7 +3977,7 @@
- Edge** Triangles::MakeGeometricalEdgeToEdge()
-  {
-   assert(Gh.nbe);
--  Edge **e= new (Edge* [Gh.nbe]);
-+  Edge **e= new (Edge* [this->Gh.nbe]);
-   
-   Int4 i;
-   for ( i=0;i<Gh.nbe ; i++)
---- a/contrib/bamg/bamglib/MeshRead.cpp
-+++ b/contrib/bamg/bamglib/MeshRead.cpp
-@@ -119,7 +119,7 @@
- 	   nbvx=nbv;
- 	   vertices=new Vertex[nbvx];
- 	   assert(vertices);
--	   ordre=new (Vertex* [nbvx]);
-+	   ordre=new (Vertex* [this->nbvx]);
- 	   assert(ordre);
- 	   
- 	   nbiv = nbv;
-@@ -399,7 +399,7 @@
-      triangles =new Triangle[nbtx];
-      assert(triangles);
-      vertices=new Vertex[nbvx];
--     ordre=new (Vertex* [nbvx]);
-+     ordre=new (Vertex* [this->nbvx]);
-      
-      for (     i=0;i<nbt;i++)
-        {
-@@ -448,7 +448,7 @@
-   triangles =new Triangle[nbtx];
-   assert(triangles);
-   vertices=new Vertex[nbvx];
--  ordre=new (Vertex* [nbvx]);
-+  ordre=new (Vertex* [this->nbvx]);
-   
- 
-   Int4 i;
-@@ -547,7 +547,7 @@
-   triangles =new Triangle[nbtx];
-   assert(triangles);
-   vertices=new Vertex[nbvx];
--  ordre=new (Vertex* [nbvx]);
-+  ordre=new (Vertex* [this->nbvx]);
- 
- 
-  f_in >> l;
-@@ -711,7 +711,7 @@
-   triangles =new Triangle[nbtx];
-   assert(triangles);
-   vertices=new Vertex[nbvx];
--  ordre=new (Vertex* [nbvx]);
-+  ordre=new (Vertex* [this->nbvx]);
-   Int4 k=0;
-   
-   for ( i=0;i<ne;i++) 
-@@ -774,7 +774,7 @@
-      triangles =new Triangle[nbtx];
-      assert(triangles);
-      vertices=new Vertex[nbvx];
--     ordre=new (Vertex* [nbvx]);
-+     ordre=new (Vertex* [this->nbvx]);
-       edges = new Edge[nbe];
-      for ( i=0;i<nbv;i++)
- 	{
-@@ -822,7 +822,7 @@
-      triangles =new Triangle[nbtx];
-      assert(triangles);
-      vertices=new Vertex[nbvx];
--     ordre=new (Vertex* [nbvx]);
-+     ordre=new (Vertex* [this->nbvx]);
-      Int4 j;
-       for ( i=0;i<nbv;i++)
- 	{
diff --git a/debian/patches/series b/debian/patches/series
index f922919..55aa53d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ fix_FTBFS_linking.patch
 alauzet.patch
 cgns.patch
 pedantic.patch
-fix_FTBFS_gcc-4.7_bamg.patch

-- 
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.