[dune-grid-glue] 02/04: Drop patches that were backported from 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-grid-glue.

commit 06805facca1feeb3b42b963ac5cf40e07ba29f6a
Author: Ansgar Burchardt <Ansgar.Burchardt at tu-dresden.de>
Date:   Wed Jan 20 14:05:46 2016 +0100

    Drop patches that were backported from upstream.
---
 debian/patches/0001-Add-MPI-library.patch      | 24 ------------------------
 debian/patches/0002-Add-psurface-library.patch | 19 -------------------
 debian/patches/series                          |  2 --
 3 files changed, 45 deletions(-)

diff --git a/debian/patches/0001-Add-MPI-library.patch b/debian/patches/0001-Add-MPI-library.patch
deleted file mode 100644
index ce296c1..0000000
--- a/debian/patches/0001-Add-MPI-library.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 631d5a0efddd83282046c71fef9af3e6935ec6ca Mon Sep 17 00:00:00 2001
-From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
-Date: Mon, 7 Sep 2015 15:02:34 +0200
-Subject: [PATCH 1/2] Add MPI library
-
-Otherwise compiling the test fails with
-
-  /usr/bin/ld: nonoverlappingcouplingtest_mpi-nonoverlappingcouplingtest.o: undefined reference to symbol 'MPI_Waitany'
-  //usr/lib/libmpi.so.1: error adding symbols: DSO missing from command line
-  collect2: error: ld returned 1 exit status
----
- dune/grid-glue/test/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/dune/grid-glue/test/Makefile.am
-+++ b/dune/grid-glue/test/Makefile.am
-@@ -38,6 +38,7 @@
- nonoverlappingcouplingtest_mpi_SOURCES = nonoverlappingcouplingtest.cc
- nonoverlappingcouplingtest_mpi_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS) -DWRITE_TO_VTK
- nonoverlappingcouplingtest_mpi_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
-+nonoverlappingcouplingtest_mpi_LDADD = $(LDADD) $(DUNEMPILIBS)
- endif
- mixeddimcouplingtest_SOURCES = mixeddimcouplingtest.cc
- mixeddimoverlappingtest_SOURCES = mixeddimoverlappingtest.cc
diff --git a/debian/patches/0002-Add-psurface-library.patch b/debian/patches/0002-Add-psurface-library.patch
deleted file mode 100644
index 6785261..0000000
--- a/debian/patches/0002-Add-psurface-library.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 17ae48cc27975a113b1d721f7e661f47a99f78ca Mon Sep 17 00:00:00 2001
-From: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
-Date: Mon, 7 Sep 2015 15:16:09 +0200
-Subject: [PATCH 2/2] Add psurface library.
-
----
- dune/grid-glue/test/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/dune/grid-glue/test/Makefile.am
-+++ b/dune/grid-glue/test/Makefile.am
-@@ -21,6 +21,7 @@
- 
- AM_CPPFLAGS += $(PSURFACE_CPPFLAGS)
- AM_LDFLAGS  += $(PSURFACE_LDFLAGS) $(AMIRAMESH_LDFLAGS)
-+LDADD       += $(PSURFACE_LIBS)
- 
- # If UG is available we can test pyramids and prisms
- AM_CPPFLAGS += $(UG_CPPFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 7e48daa..4db24c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 soname.patch
-0001-Add-MPI-library.patch
-0002-Add-psurface-library.patch

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