[dune-grid] 01/05: Drop backported patches.
Ansgar Burchardt
ansgar at moszumanska.debian.org
Sun Feb 28 14:22:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
ansgar pushed a commit to annotated tag debian/2.4.1.rc2-1
in repository dune-grid.
commit 39111919640b2727d5b94b5fddfd5ab13221d1e7
Author: Ansgar Burchardt <ansgar at debian.org>
Date: Sun Feb 28 15:01:36 2016 +0100
Drop backported patches.
---
...Mapper-Fix-misleading-deprecation-message.patch | 25 ------------
...PartitionSet-Make-PartitionSet-comparable.patch | 44 ----------------------
...0003-CMake-Include-used-CheckIncludeFiles.patch | 29 --------------
...de-used-CheckIncludeFiles-to-FindGrape-to.patch | 24 ------------
debian/patches/series | 4 --
5 files changed, 126 deletions(-)
diff --git a/debian/patches/0001-MCMGMapper-Fix-misleading-deprecation-message.patch b/debian/patches/0001-MCMGMapper-Fix-misleading-deprecation-message.patch
deleted file mode 100644
index 41f654d..0000000
--- a/debian/patches/0001-MCMGMapper-Fix-misleading-deprecation-message.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e7d2296d8a7224c58cb0180b3ea26b9977903b5f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich at dune-project.org>
-Date: Tue, 6 Oct 2015 13:28:11 +0200
-Subject: [PATCH 1/4] [MCMGMapper] Fix misleading deprecation message.
-
----
- dune/grid/common/mcmgmapper.hh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dune/grid/common/mcmgmapper.hh b/dune/grid/common/mcmgmapper.hh
-index bd13336..41eda65 100644
---- a/dune/grid/common/mcmgmapper.hh
-+++ b/dune/grid/common/mcmgmapper.hh
-@@ -173,7 +173,7 @@ namespace Dune
- \param codim Codimension of the subentity
- \return An index in the range 0 ... Max number of entities in set - 1.
- */
-- Index DUNE_DEPRECATED_MSG("Will be removed after dune-grid-2.4. Use method 'index' instead!") map (const typename GV::template Codim<0>::Entity& e, int i, unsigned int codim) const
-+ Index DUNE_DEPRECATED_MSG("Will be removed after dune-grid-2.4. Use method 'subIndex' instead!") map (const typename GV::template Codim<0>::Entity& e, int i, unsigned int codim) const
- {
- GeometryType gt=ReferenceElements<double,GV::dimension>::general(e.type()).type(i,codim);
- assert(layout.contains(gt));
---
-2.7.0.rc3
-
diff --git a/debian/patches/0002-PartitionSet-Make-PartitionSet-comparable.patch b/debian/patches/0002-PartitionSet-Make-PartitionSet-comparable.patch
deleted file mode 100644
index 868d7bf..0000000
--- a/debian/patches/0002-PartitionSet-Make-PartitionSet-comparable.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 34ce5171ae6fb97180310682a9759369607807e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Steffen=20M=C3=BCthing?= <muething at dune-project.org>
-Date: Wed, 23 Sep 2015 11:07:19 +0200
-Subject: [PATCH 2/4] [PartitionSet] Make PartitionSet comparable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's just a whole lot nice to write partitions == Partitions::all than
-std::is_same<decltype(partitions),decltype(Partitions:all)>::value
-
-(cherry picked from commit 1b3e83ec04a72b32df7e6c9614b62853b6491b06)
-Signed-off-by: Steffen Müthing <muething at dune-project.org>
----
- dune/grid/common/partitionset.hh | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/dune/grid/common/partitionset.hh b/dune/grid/common/partitionset.hh
-index 8318dce..9917483 100644
---- a/dune/grid/common/partitionset.hh
-+++ b/dune/grid/common/partitionset.hh
-@@ -162,6 +162,19 @@ namespace Dune {
- return (partitions & contained_partitions) == contained_partitions;
- }
-
-+ //! Tests whether two PartitionsSet are equal.
-+ template<unsigned int p2>
-+ DUNE_CONSTEXPR bool operator==(PartitionSet<p2>) const
-+ {
-+ return partitions == p2;
-+ }
-+
-+ //! Tests whether two PartitionsSet are not equal.
-+ template<unsigned int p2>
-+ DUNE_CONSTEXPR bool operator!=(PartitionSet<p2>) const
-+ {
-+ return partitions != p2;
-+ }
-
- };
-
---
-2.7.0.rc3
-
diff --git a/debian/patches/0003-CMake-Include-used-CheckIncludeFiles.patch b/debian/patches/0003-CMake-Include-used-CheckIncludeFiles.patch
deleted file mode 100644
index 8349092..0000000
--- a/debian/patches/0003-CMake-Include-used-CheckIncludeFiles.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 652c97d013df39f7192f2d5d54000c36e04fe0de Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich at dune-project.org>
-Date: Fri, 13 Nov 2015 10:33:47 +0100
-Subject: [PATCH 3/4] [CMake] Include used CheckIncludeFiles
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-(cherry picked from commit e80622a5ffe0cadbc2bf5ba85099a5ea0ece43c3)
-Signed-off-by: Christoph Grüninger <gruenich at dune-project.org>
----
- cmake/modules/FindAlberta.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/modules/FindAlberta.cmake b/cmake/modules/FindAlberta.cmake
-index 98a045a..0281f8c 100644
---- a/cmake/modules/FindAlberta.cmake
-+++ b/cmake/modules/FindAlberta.cmake
-@@ -40,6 +40,7 @@ cmake_push_check_state()
- set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DDIM_OF_WORLD=3 -DDEL_INDEX=0)
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ALBERTA_INCLUDES})
-
-+include(CheckIncludeFiles)
- check_include_files(alberta/alberta.h ALBERTA_FOUND)
-
- if(NOT ALBERTA_FOUND)
---
-2.7.0.rc3
-
diff --git a/debian/patches/0004-CMake-Include-used-CheckIncludeFiles-to-FindGrape-to.patch b/debian/patches/0004-CMake-Include-used-CheckIncludeFiles-to-FindGrape-to.patch
deleted file mode 100644
index 6a9e18f..0000000
--- a/debian/patches/0004-CMake-Include-used-CheckIncludeFiles-to-FindGrape-to.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From db4ad282e263ddcab70270c528aafc8ad43a2050 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich at dune-project.org>
-Date: Mon, 16 Nov 2015 16:16:32 +0100
-Subject: [PATCH 4/4] [CMake] Include used CheckIncludeFiles to FindGrape, too
-
----
- cmake/modules/FindGrape.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/modules/FindGrape.cmake b/cmake/modules/FindGrape.cmake
-index de8d19d..85593dd 100644
---- a/cmake/modules/FindGrape.cmake
-+++ b/cmake/modules/FindGrape.cmake
-@@ -47,6 +47,7 @@ cmake_push_check_state()
- set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -DENABLE_GRAPE")
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR} ${GRAPE_INCLUDE_DIR})
- set(CMAKE_REQUIRED_LIBRARIES ${OPENGL_LIBRARIES} ${XEXT_LIBS} ${CMAKE_REQUIRED_LIBRARIES} dl m)
-+include(CheckIncludeFiles)
- check_include_files(grape.h _GRAPE_HEADER_USABLE)
-
- # find library
---
-2.7.0.rc3
-
diff --git a/debian/patches/series b/debian/patches/series
index f8dd10a..f44d6e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
soname.patch
disable-alberta3d-test.patch
do-not-install-amiramesh-grids.patch
-0001-MCMGMapper-Fix-misleading-deprecation-message.patch
-0002-PartitionSet-Make-PartitionSet-comparable.patch
-0003-CMake-Include-used-CheckIncludeFiles.patch
-0004-CMake-Include-used-CheckIncludeFiles-to-FindGrape-to.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-grid.git
More information about the debian-science-commits
mailing list