[clasp] 03/05: Remove parallel solve patch introduced in clasp 3.1.4-2

[Thomas Krennwallner]

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

tkren-guest pushed a commit to branch devel
in repository clasp.

commit 8be42fc761fde5f26f7ec0968b217cb947a17449
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sun Sep 4 09:38:30 2016 +0200

    Remove parallel solve patch introduced in clasp 3.1.4-2
---
 debian/patches/clasp-parallel-solve.patch | 17 -----------------
 debian/patches/series                     |  1 -
 2 files changed, 18 deletions(-)

diff --git a/debian/patches/clasp-parallel-solve.patch b/debian/patches/clasp-parallel-solve.patch
deleted file mode 100644
index df407bf..0000000
--- a/debian/patches/clasp-parallel-solve.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Benjamin Kaufmann <kaufmann at cs.uni-potsdam.de>
-Description: fixes wrong number of optimal models in parallel mode
-Bug: https://sourceforge.net/p/potassco/bugs/116/
-Index: clasp-git-gbp/libclasp/src/parallel_solve.cpp
-===================================================================
---- clasp-git-gbp.orig/libclasp/src/parallel_solve.cpp
-+++ clasp-git-gbp/libclasp/src/parallel_solve.cpp
-@@ -360,6 +360,9 @@ void ParallelSolve::joinThreads() {
- 		}
- 		destroyThread(i);
- 	}
-+	if (shared_->complete()) {
-+		enumerator().commitComplete();
-+	}
- 	// detach master only after all client threads are done
- 	thread_[masterId]->detach(*shared_->ctx, shared_->interrupt());
- 	thread_[masterId]->setError(!shared_->interrupt() ? thread_[masterId]->error() : ec);
diff --git a/debian/patches/series b/debian/patches/series
index c78dfaa..b31f497 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 clasp-manpage.patch
-clasp-parallel-solve.patch

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