[dune-pdelab] 01/01: Fix two build problems in the test suite.

[Ansgar Burchardt]

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

ansgar pushed a commit to branch master
in repository dune-pdelab.

commit 757b6a5f633ac82a7a6a1b2c075b358b034df0b5
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sat Jan 11 16:41:14 2014 +0100

    Fix two build problems in the test suite.
---
 ...uild-testordering-if-ALUGrid-is-available.patch | 27 ++++++++++++++++++++++
 .../patches/0001-Use-PkLocalFiniteElementMap.patch | 25 ++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 54 insertions(+)

diff --git a/debian/patches/0001-Only-build-testordering-if-ALUGrid-is-available.patch b/debian/patches/0001-Only-build-testordering-if-ALUGrid-is-available.patch
new file mode 100644
index 0000000..3f24489
--- /dev/null
+++ b/debian/patches/0001-Only-build-testordering-if-ALUGrid-is-available.patch
@@ -0,0 +1,27 @@
+From 4cd7aec8a05081f14922b6f71b267147aa1941e5 Mon Sep 17 00:00:00 2001
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Sat, 11 Jan 2014 15:32:04 +0100
+Subject: [PATCH] Only build testordering if ALUGrid is available.
+
+---
+ dune/pdelab/test/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dune/pdelab/test/Makefile.am b/dune/pdelab/test/Makefile.am
+index 14bb843..2222e27 100644
+--- a/dune/pdelab/test/Makefile.am
++++ b/dune/pdelab/test/Makefile.am
+@@ -285,8 +285,10 @@ testopbfem_LDFLAGS = $(AM_LDFLAGS) $(GMP_LDFLAGS)
+ testopbfem_LDADD = $(LDADD) $(GMP_LIBS)
+ endif
+ 
++if ALUGRID
+ check_PROGRAMS += testordering
+ testordering_SOURCES = testordering.cc
++endif
+ 
+ check_PROGRAMS += testpermutedordering
+ testpermutedordering_SOURCES = testpermutedordering.cc
+-- 
+1.8.5.2
+
diff --git a/debian/patches/0001-Use-PkLocalFiniteElementMap.patch b/debian/patches/0001-Use-PkLocalFiniteElementMap.patch
new file mode 100644
index 0000000..56c26f9
--- /dev/null
+++ b/debian/patches/0001-Use-PkLocalFiniteElementMap.patch
@@ -0,0 +1,25 @@
+From 8b437b32a9ecc9a30c65acc660c3df5b004bf23f Mon Sep 17 00:00:00 2001
+From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
+Date: Sat, 11 Jan 2014 15:14:52 +0100
+Subject: [PATCH] Use PkLocalFiniteElementMap.
+
+---
+ dune/pdelab/test/testpoisson.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dune/pdelab/test/testpoisson.cc b/dune/pdelab/test/testpoisson.cc
+index 385bada..ab2e3ca 100644
+--- a/dune/pdelab/test/testpoisson.cc
++++ b/dune/pdelab/test/testpoisson.cc
+@@ -416,7 +416,7 @@ int main(int argc, char** argv)
+       typedef double R;
+       const int k=3;
+       const int q=2*k;
+-      typedef Dune::PDELab::Pk2DLocalFiniteElementMap<GV,DF,double,k> FEM;
++      typedef Dune::PDELab::PkLocalFiniteElementMap<GV,DF,double,k> FEM;
+       FEM fem(gv);
+ 
+       // solve problem
+-- 
+1.8.5.2
+
diff --git a/debian/patches/series b/debian/patches/series
index a402fe8..8809320 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 soname.patch
 do-not-install-files-from-dune-typetree.patch
+0001-Use-PkLocalFiniteElementMap.patch
+0001-Only-build-testordering-if-ALUGrid-is-available.patch

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