[SCM] Packaging for dune-grid: a toolbox for solving PDEs -- grid interface branch, master, updated. debian/2.2.svn7982-1

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit ad47256f2a8881304194d83be3148921e33313c7
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Fri Apr 6 11:31:19 2012 +0200

    Add UserData type to AlbertaGridGeometryTraits.

diff --git a/debian/patches/geometry-changes.patch b/debian/patches/geometry-changes.patch
new file mode 100644
index 0000000..8ac30cf
--- /dev/null
+++ b/debian/patches/geometry-changes.patch
@@ -0,0 +1,17 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Fri, 06 Apr 2012 11:30:16 +0200
+Subject: add UserData type to AlbertaGridGeometryTraits
+Origin: vendor
+
+--- a/dune/grid/albertagrid/geometry.hh
++++ b/dune/grid/albertagrid/geometry.hh
+@@ -164,6 +164,9 @@
+       static const GenericGeometry::EvaluationType evaluateNormal = GenericGeometry::ComputeOnDemand;
+     };
+ 
++    /** \brief type of additional user data to be stored in each mapping
++     */
++    struct UserData {};
+   };
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6233441..1bccf2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ soname.patch
 disable-alberta3d-test.patch
 install-grids-as-doc.patch
 do-not-install-amiramesh-grids.patch
+geometry-changes.patch

-- 
Packaging for dune-grid: a toolbox for solving PDEs -- grid interface