[open-coarrays] 51/80: disable_ns_test.patch, typos.patch, oversubscribe.patch merged upstream

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository open-coarrays.

commit aef4f738d8fd642a1fb0856ab74f67bc554ef933
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Apr 20 12:22:13 2017 +0100

    disable_ns_test.patch, typos.patch, oversubscribe.patch merged upstream
---
 debian/changelog                   |  3 +--
 debian/patches/oversubscribe.patch | 19 -------------------
 debian/patches/series              |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92d277b..98dab19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
 open-coarrays (1.8.6-1) UNRELEASED; urgency=medium
 
   * New upstream release
-    - disable_ns_test.patch merged upstream
-    - typos.patch merged upstream
+    - disable_ns_test.patch, typos.patch, oversubscribe.patch merged upstream
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 20 Apr 2017 12:03:50 +0100
 
diff --git a/debian/patches/oversubscribe.patch b/debian/patches/oversubscribe.patch
deleted file mode 100644
index 648b62d..0000000
--- a/debian/patches/oversubscribe.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Use --oversubscribe not --oversubscribed on openmpi 
-Last-Updated: 2016-12-02
-Forwarded: yes
-Bug-Origin: https://bugs.debian.org/846681
-
-Index: open-coarrays-1.7.4/CMakeLists.txt
-===================================================================
---- open-coarrays-1.7.4.orig/CMakeLists.txt
-+++ open-coarrays-1.7.4/CMakeLists.txt
-@@ -167,7 +167,7 @@ function(add_mpi_test name num_mpi_proc
-      if ( openmpi )
-        if ( N LESS 2 )
- 	 set( num_mpi_proc 2 )
--	 set (test_parameters --oversubscribed)
-+	 set (test_parameters --oversubscribe)
-        else()
- 	 set ( num_mpi_proc ${N} )
-        endif()
diff --git a/debian/patches/series b/debian/patches/series
index 70a678b..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-oversubscribe.patch

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