[dune-grid-glue] 01/02: Update patches for 2.3.0.

[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 ffef67143827ce74e52b2b662c8eb4839337722f
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Mon Oct 6 14:47:28 2014 +0200

    Update patches for 2.3.0.
---
 debian/patches/cmake.patch   |  7 ------
 debian/patches/install.patch | 52 --------------------------------------------
 debian/patches/series        |  2 --
 3 files changed, 61 deletions(-)

diff --git a/debian/patches/cmake.patch b/debian/patches/cmake.patch
deleted file mode 100644
index 2b534f1..0000000
--- a/debian/patches/cmake.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -15,3 +15,4 @@
- 
- include $(top_srcdir)/am/top-rules
- include $(top_srcdir)/am/global-rules
-+include $(top_srcdir)/am/cmake-pkg-config
diff --git a/debian/patches/install.patch b/debian/patches/install.patch
deleted file mode 100644
index 84389d3..0000000
--- a/debian/patches/install.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/dune/grid-glue/Makefile.am
-+++ b/dune/grid-glue/Makefile.am
-@@ -1,5 +1,5 @@
--gluedir = $(includedir)/glue
--glue_HEADERS = \
-+gridgluedir = $(includedir)/dune/grid-glue
-+gridglue_HEADERS = \
- 	gridglue.hh
- 
- SUBDIRS = adapter merging common extractors test
---- a/dune/grid-glue/adapter/Makefile.am
-+++ b/dune/grid-glue/adapter/Makefile.am
-@@ -1,7 +1,7 @@
- # $Id: Makefile.am 4229 2009-03-16 14:41:32Z chupa $
- 
- # These libraries do not need other libraries besides lcommon and lgrid
--adapterdir = $(includedir)/dune/glue/adapter
-+adapterdir = $(includedir)/dune/grid-glue/adapter
- adapter_HEADERS = \
- 	gridglue.hh\
-     gridgluecommunicate.hh \
---- a/dune/grid-glue/extractors/Makefile.am
-+++ b/dune/grid-glue/extractors/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am 4229 2009-03-16 14:41:32Z chupa $
- 
--extractorsdir = $(includedir)/dune/glue/extractors
-+extractorsdir = $(includedir)/dune/grid-glue/extractors
- extractors_HEADERS = codim0extractor.hh codim1extractor.hh extractor.hh \
- 	extractorpredicate.hh\
- 	vtksurfacewriter.hh
---- a/dune/grid-glue/merging/Makefile.am
-+++ b/dune/grid-glue/merging/Makefile.am
-@@ -1,7 +1,7 @@
- # $Id: Makefile.am 4229 2009-03-16 14:41:32Z chupa $
- 
- # These libraries do not need other libraries besides lcommon and lgrid
--mergingdir = $(includedir)/dune/glue/merging
-+mergingdir = $(includedir)/dune/grid-glue/merging
- merging_HEADERS = conformingmerge.hh \
-                   contactmerge.hh \
-                   merger.hh \
---- a/m4/Makefile.am
-+++ b/m4/Makefile.am
-@@ -1,6 +1,6 @@
- M4FILES = dune-grid-glue.m4
- 
--aclocaldir = $(datadir)/aclocal
-+aclocaldir = $(datadir)/dune/aclocal
- aclocal_DATA = $(M4FILES)
- 
- EXTRA_DIST = $(M4FILES) CMakeLists.txt
diff --git a/debian/patches/series b/debian/patches/series
index c27a036..4db24c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 soname.patch
-cmake.patch
-install.patch

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