[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 7c4325ad18ef27c4861c31c44af51e81d21aa186
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu Apr 5 20:24:53 2012 +0200

    Do not install amiramesh example grids.

diff --git a/debian/patches/do-not-install-amiramesh-grids.patch b/debian/patches/do-not-install-amiramesh-grids.patch
new file mode 100644
index 0000000..d3b379c
--- /dev/null
+++ b/debian/patches/do-not-install-amiramesh-grids.patch
@@ -0,0 +1,21 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Thu, 05 Apr 2012 20:22:30 +0200
+Subject: do not install amiramesh example grids
+Origin: vendor
+Forwarded: not-needed
+
+The amiramesh example grids have been removed from the Debian source as they
+are not usable without a non-free library.
+--- a/doc/grids/amiramesh/Makefile.am
++++ b/doc/grids/amiramesh/Makefile.am
+@@ -2,8 +2,8 @@
+   simplex-testgrid-2d.am  hybrid-testgrid-2d.am  simplex-testgrid-3d.am
+ 
+ amiragridsdir=$(datadir)/doc/dune-grid/grids/amiramesh
+-amiragrids_DATA = $(GRIDS)
+-EXTRA_DIST = $(GRIDS)
++#amiragrids_DATA = $(GRIDS)
++#EXTRA_DIST = $(GRIDS)
+ 
+ include $(top_srcdir)/am/webstuff
+ include $(top_srcdir)/am/global-rules
diff --git a/debian/patches/series b/debian/patches/series
index 063b058..6233441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 soname.patch
 disable-alberta3d-test.patch
 install-grids-as-doc.patch
+do-not-install-amiramesh-grids.patch

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