[dune-pdelab] 01/05: Drop patch 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.5.0_20170124g7cf9f47a-1
in repository dune-pdelab.

commit dddb7cca748f03b8bd3d79834f36c1fbdf1e5a97
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Tue Jan 24 21:48:23 2017 +0100

    Drop patch applied upstream.
---
 .../0001-Increase-timeout-to-default-300s.patch    | 79 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 80 deletions(-)

diff --git a/debian/patches/0001-Increase-timeout-to-default-300s.patch b/debian/patches/0001-Increase-timeout-to-default-300s.patch
deleted file mode 100644
index 20e6bae..0000000
--- a/debian/patches/0001-Increase-timeout-to-default-300s.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 1e96ccc24f41ef758c298e05af94fde61269c7da Mon Sep 17 00:00:00 2001
-From: Ansgar Burchardt <Ansgar.Burchardt at tu-dresden.de>
-Date: Tue, 6 Dec 2016 13:09:43 +0100
-Subject: [PATCH] Increase timeout to default (300s)
-
-The short timeout of 20s was too short on several of Debian's slower
-architectures, for example [armel], [armhf], [mips], [mips64el] and
-[powerpc].
-
-  [armel]: https://buildd.debian.org/status/fetch.php?pkg=dune-pdelab&arch=armel&ver=2.5.0%7E20161204gdb53a76-1&stamp=1481000268
-  [armhf]: https://buildd.debian.org/status/fetch.php?pkg=dune-pdelab&arch=armhf&ver=2.5.0%7E20161204gdb53a76-1&stamp=1480999871
-  [mips]: https://buildd.debian.org/status/fetch.php?pkg=dune-pdelab&arch=mips&ver=2.5.0%7E20161204gdb53a76-1&stamp=1481000655
-  [mips64el]: https://buildd.debian.org/status/fetch.php?pkg=dune-pdelab&arch=mips64el&ver=2.5.0%7E20161204gdb53a76-1&stamp=1481015288
-  [powerpc]: https://buildd.debian.org/status/fetch.php?pkg=dune-pdelab&arch=powerpc&ver=2.5.0%7E20161204gdb53a76-1&stamp=1480990227
----
- dune/pdelab/test/CMakeLists.txt | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/dune/pdelab/test/CMakeLists.txt b/dune/pdelab/test/CMakeLists.txt
-index 7f38da9..e1b5fa9 100644
---- a/dune/pdelab/test/CMakeLists.txt
-+++ b/dune/pdelab/test/CMakeLists.txt
-@@ -88,7 +88,7 @@ if(dune-alugrid_FOUND)
-   dune_add_test(SOURCES testloadbalancing.cc
-                 COMPILE_DEFINITIONS GRIDSDIR=\"${CMAKE_CURRENT_SOURCE_DIR}/grids\"
-                 MPI_RANKS 2
--                TIMEOUT 20)
-+                TIMEOUT 300)
- endif(dune-alugrid_FOUND)
- 
- if(GMP_FOUND)
-@@ -103,38 +103,38 @@ foreach(degree IN ITEMS 1 2)
-                   SOURCES testpoisson-periodic-2d.cc
-                   MPI_RANKS 1 2
-                   COMPILE_DEFINITIONS DEGREE=${degree} DG=${dg}
--                  TIMEOUT 20)
-+                  TIMEOUT 300)
- 
-     dune_add_test(NAME testpoisson-periodic-3d-deg${degree}-dg${dg}-parallel
-                   SOURCES testpoisson-periodic-3d.cc
-                   MPI_RANKS 1 4
-                   COMPILE_DEFINITIONS DEGREE=${degree} DG=${dg}
--                  TIMEOUT 20)
-+                  TIMEOUT 300)
-   endforeach()
- endforeach()
- 
- dune_add_test(NAME testnonoverlappingsinglephaseflow-yasp
-               SOURCES testnonoverlappingsinglephaseflow.cc
-               MPI_RANKS 1 2
--              TIMEOUT 20)
-+              TIMEOUT 300)
- 
- if(UG_FOUND)
-   dune_add_test(NAME testnonoverlappingsinglephaseflow-ug
-                 SOURCES testnonoverlappingsinglephaseflow.cc
-                 COMPILE_DEFINITIONS GRID_UG
-                 MPI_RANKS 1 2
--                TIMEOUT 20)
-+                TIMEOUT 300)
- 
-   dune_add_test(SOURCES testnonoverlappingsinglephaseflow-boilerplate.cc
-                 COMPILE_DEFINITIONS GRIDSDIR=\"${CMAKE_CURRENT_SOURCE_DIR}/grids\"
-                 MPI_RANKS 2
--                TIMEOUT 20)
-+                TIMEOUT 300)
- 
-   dune_add_test(SOURCES testadaptivity.cc)
- 
-   dune_add_test(SOURCES testnonoverlapping.cc
-                 MPI_RANKS 2
--                TIMEOUT 20)
-+                TIMEOUT 300)
- endif()
- 
- exclude_from_headercheck(
--- 
-2.10.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 3e9944e..4e54818 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Increase-timeout-to-default-300s.patch
 increase-timeout.patch

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