[dune-pdelab] 01/04: Remove patches that were 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.0.20140205g0cee0ce-1
in repository dune-pdelab.

commit 5943b545eca6b84d6b2b214a4d5700fb8bb2f3e8
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Mon Feb 17 12:31:18 2014 +0100

    Remove patches that were applied upstream.
---
 ...uild-testordering-if-ALUGrid-is-available.patch | 27 ----------------------
 .../patches/0001-Use-PkLocalFiniteElementMap.patch | 25 --------------------
 debian/patches/series                              |  2 --
 3 files changed, 54 deletions(-)

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
deleted file mode 100644
index 3f24489..0000000
--- a/debian/patches/0001-Only-build-testordering-if-ALUGrid-is-available.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 56c26f9..0000000
--- a/debian/patches/0001-Use-PkLocalFiniteElementMap.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 3bd894a..74c66d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 soname.patch
 do-not-install-files-from-dune-typetree.patch
-0001-Use-PkLocalFiniteElementMap.patch
-0001-Only-build-testordering-if-ALUGrid-is-available.patch
 disable-testpoisson-globalfe.patch

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