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

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit fff72e520da887bbdfbd2c94cb6147ab3656f368
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Tue Apr 10 21:31:51 2012 +0200

    Drop patch geometry-changes.patch: applied upstream.

diff --git a/debian/patches/geometry-changes.patch b/debian/patches/geometry-changes.patch
deleted file mode 100644
index 8ac30cf..0000000
--- a/debian/patches/geometry-changes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 1bccf2d..6233441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ 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