[dune-grid] 03/10: Drop install-grids-as-doc.patch (applied upstream).

[Ansgar Burchardt]

This is an automated email from the git hooks/post-receive script.

ansgar pushed a commit to annotated tag debian/2.3.20140101g16be0c0-1
in repository dune-grid.

commit fad73f6798df77f489daeb33d0f1ea8af6dfebca
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Wed Jan 1 19:07:08 2014 +0100

    Drop install-grids-as-doc.patch (applied upstream).
---
 debian/patches/install-grids-as-doc.patch | 68 -------------------------------
 debian/patches/series                     |  1 -
 2 files changed, 69 deletions(-)

diff --git a/debian/patches/install-grids-as-doc.patch b/debian/patches/install-grids-as-doc.patch
deleted file mode 100644
index b2edc62..0000000
--- a/debian/patches/install-grids-as-doc.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Date: Thu, 05 Apr 2012 20:20:44 +0200
-Subject: install example grids as documentation
-Origin: vendor
-
---- a/doc/grids/amc/Makefile.am
-+++ b/doc/grids/amc/Makefile.am
-@@ -6,7 +6,7 @@
-         macro.amc \
-         periodic-torus.amc
- 
--amcdir=$(includedir)/dune/doc/grids/amc
-+amcdir=$(datadir)/doc/dune-grid/grids/amc
- amc_DATA = $(GRIDS)
- EXTRA_DIST = $(GRIDS)
- 
---- a/doc/grids/amiramesh/Makefile.am
-+++ b/doc/grids/amiramesh/Makefile.am
-@@ -1,7 +1,7 @@
- GRIDS = cube-testgrid-3d.am    hybrid-testgrid-3d.am \
-   simplex-testgrid-2d.am  hybrid-testgrid-2d.am  simplex-testgrid-3d.am
- 
--amiragridsdir=$(includedir)/dune/doc/grids/amiramesh
-+amiragridsdir=$(datadir)/doc/dune-grid/grids/amiramesh
- amiragrids_DATA = $(GRIDS)
- EXTRA_DIST = $(GRIDS)
- 
---- a/doc/grids/dgf/Makefile.am
-+++ b/doc/grids/dgf/Makefile.am
-@@ -41,7 +41,7 @@
-         torus-3.dgf \
-         unstr_cube.dgf
-                  
--dgfdir=$(includedir)/dune/doc/grids/dgf
-+dgfdir=$(datadir)/doc/dune-grid/grids/dgf
- dgf_DATA = $(GRIDS)
- EXTRA_DIST = $(GRIDS)
- 
---- a/doc/grids/gmsh/Makefile.am
-+++ b/doc/grids/gmsh/Makefile.am
-@@ -4,7 +4,7 @@
- telescope.msh curved2d.geo        pyramid2ndorder.msh  telescope1storder.msh \
- sphere.msh  oned-testgrid.msh
- 
--gmshdir=$(includedir)/dune/doc/grids/gmsh
-+gmshdir=$(datadir)/doc/dune-grid/grids/gmsh
- gmsh_DATA = $(GRIDS)
- EXTRA_DIST = $(GRIDS)
- 
---- a/doc/grids/gridfactory/Makefile.am
-+++ b/doc/grids/gridfactory/Makefile.am
-@@ -1,4 +1,4 @@
--gridfactorydir=$(includedir)/dune/doc/grids/gridfactory
-+gridfactorydir=$(datadir)/doc/dune-grid/grids/gridfactory
- gridfactory_HEADERS=hybridtestgrids.hh
- 
- include $(top_srcdir)/am/webstuff
---- a/doc/grids/starcd/Makefile.am
-+++ b/doc/grids/starcd/Makefile.am
-@@ -1,7 +1,7 @@
- GRIDS = star.vrt  tets.vrt       withprism.vrt    withpyramid.vrt \
-            star.cel     tets.cel  withprism.cel  withpyramid.cel
- 
--starcdgridsdir=$(includedir)/dune/doc/grids/starcd
-+starcdgridsdir=$(datadir)/doc/dune-grid/grids/starcd
- starcdgrids_DATA = $(GRIDS)
- EXTRA_DIST = $(GRIDS)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6233441..f44d6e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 soname.patch
 disable-alberta3d-test.patch
-install-grids-as-doc.patch
 do-not-install-amiramesh-grids.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-grid.git