[dune-pdelab] 03/04: Drop patches (either no longer needed or fixed upstream).

[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 88ec9e2b9548ab310587150cbc65305faa644d90
Author: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
Date:   Fri Jun 20 15:33:42 2014 +0200

    Drop patches (either no longer needed or fixed upstream).
---
 debian/patches/disable-testpoisson-globalfe.patch  | 17 -----------------
 .../do-not-install-files-from-dune-typetree.patch  | 22 ----------------------
 debian/patches/series                              |  2 --
 3 files changed, 41 deletions(-)

diff --git a/debian/patches/disable-testpoisson-globalfe.patch b/debian/patches/disable-testpoisson-globalfe.patch
deleted file mode 100644
index 80d0fb4..0000000
--- a/debian/patches/disable-testpoisson-globalfe.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Subject: disable failing test
-
-testpoisson-globalfe crashes with a segmentation fault and stack
-corruption when using Alberta. Disable it for now.
-
---- a/dune/pdelab/test/Makefile.am
-+++ b/dune/pdelab/test/Makefile.am
-@@ -218,7 +218,7 @@
- 	$(ALBERTA_LIBS)
- MOSTLYCLEANFILES += poisson_*.vtu
- 
--NORMALTESTS += testpoisson-globalfe
-+#NORMALTESTS += testpoisson-globalfe
- testpoisson_globalfe_SOURCES = testpoisson-globalfe.cc
- testpoisson_globalfe_CPPFLAGS = $(AM_CPPFLAGS)	\
- 	$(ALBERTA_CPPFLAGS)			\
diff --git a/debian/patches/do-not-install-files-from-dune-typetree.patch b/debian/patches/do-not-install-files-from-dune-typetree.patch
deleted file mode 100644
index b3ae428..0000000
--- a/debian/patches/do-not-install-files-from-dune-typetree.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Subject: Do not install files shipped in dune-common or dune-typetree
-
-dune-common includes cxx11_initializer_list.m4. dune-typetree includes
-cxx11_decltype.m4 and gcc___typeof__.m4. Do not try to include them in
-dune-pdelab as well.
-
---- a/m4/Makefile.am
-+++ b/m4/Makefile.am
-@@ -1,12 +1,9 @@
- M4FILES =					\
- 	cxx0x_template_aliases.m4		\
--	cxx11_decltype.m4			\
--	cxx11_initializer_list.m4		\
- 	dune-pdelab.m4				\
- 	dune-posix-clock.m4			\
- 	dune-unordered-containers.m4		\
- 	eigen.m4				\
--	gcc___typeof__.m4			\
- 	petsc.m4
- 
- aclocaldir = $(datadir)/dune/aclocal
diff --git a/debian/patches/series b/debian/patches/series
index 74c66d3..4db24c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 soname.patch
-do-not-install-files-from-dune-typetree.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