[instant] 04/04: Remove debian/patches/python-cmake-fix-for-dolfin.patch

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository instant.

commit 4824ffdd98328003489e31709a19d89e06c3f46a
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat Sep 9 13:56:23 2017 +0800

    Remove debian/patches/python-cmake-fix-for-dolfin.patch
    
    now applied upstream
---
 debian/changelog                                 |  2 ++
 debian/patches/python-cmake-fix-for-dolfin.patch | 35 ------------------------
 debian/patches/series                            |  1 -
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58c685f..61161c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ instant (2017.1.0-2) UNRELEASED; urgency=medium
   * Team upload.
   * Standards-Version: 4.1.0
   * debhelper compatibility level 10
+  * Remove debian/patches/python-cmake-fix-for-dolfin.patch
+    (now applied upstream)
 
  -- Drew Parsons <dparsons at debian.org>  Sat, 09 Sep 2017 13:53:34 +0800
 
diff --git a/debian/patches/python-cmake-fix-for-dolfin.patch b/debian/patches/python-cmake-fix-for-dolfin.patch
deleted file mode 100644
index 9590077..0000000
--- a/debian/patches/python-cmake-fix-for-dolfin.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 67be09da6e9cd8907bddba7e1363da8953851bda Mon Sep 17 00:00:00 2001
-From: Johannes Ring <johannr at simula.no>
-Date: Tue, 25 Apr 2017 14:34:46 +0200
-Subject: [PATCH] Set PYTHON_EXECUTABLE to sys.executable in generated CMake
- file (used for python 2 and python 3 side-by-side installations of DOLFIN).
-
----
- instant/codegeneration.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/instant/codegeneration.py b/instant/codegeneration.py
-index 69d9644..692d7b4 100644
---- a/instant/codegeneration.py
-+++ b/instant/codegeneration.py
-@@ -380,6 +380,8 @@ ENDIF(%(package)s_FOUND)
- 
-     cmake_form = dict(module_name=module_name)
- 
-+    cmake_form["python_executable"] = sys.executable
-+
-     cmake_form["extra_libraries"] = ";".join(libraries)
-     cmake_form["extra_include_dirs"] = ";".join(include_dirs)
-     cmake_form["extra_library_dirs"] = ";".join(library_dirs)
-@@ -453,6 +455,8 @@ set (NAME %(module_name)s)
- 
- PROJECT(${NAME})
- 
-+set(PYTHON_EXECUTABLE %(python_executable)s)
-+
- %(find_packages)s
- 
- %(cppargs)s
--- 
-2.7.4.1.g5468f9e
-
diff --git a/debian/patches/series b/debian/patches/series
index 5dcfa7b..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-python-cmake-fix-for-dolfin.patch

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