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

Ansgar Burchardt ansgar at debian.org
Fri Apr 6 09:53:27 UTC 2012


The following commit has been merged in the master branch:
commit ba2d6966e8ce4c4644f2a9119076849155b6655a
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu Apr 5 20:24:28 2012 +0200

    Install example grids as documentation.

diff --git a/debian/patches/install-grids-as-doc.patch b/debian/patches/install-grids-as-doc.patch
new file mode 100644
index 0000000..b2edc62
--- /dev/null
+++ b/debian/patches/install-grids-as-doc.patch
@@ -0,0 +1,68 @@
+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 fa3e2dd..063b058 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 soname.patch
 disable-alberta3d-test.patch
+install-grids-as-doc.patch

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



More information about the debian-science-commits mailing list