[dolfin] 02/02: Remove patch for Python 3 support (fixed upstream)

[Johannes Ring]

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

johannr-guest pushed a commit to branch experimental
in repository dolfin.

commit 4415ce1732ba4a7373ce32c9341c9f75d8002279
Author: Johannes Ring <johannr at simula.no>
Date:   Tue May 30 14:58:13 2017 +0200

    Remove patch for Python 3 support (fixed upstream)
---
 debian/changelog                     |  1 +
 debian/patches/python3-support.patch | 88 ------------------------------------
 debian/patches/series                |  1 -
 3 files changed, 1 insertion(+), 89 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43b45ee..8f4acd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dolfin (2017.1.0-1) UNRELEASED; urgency=medium
     - Bump minimum required version for python-dijitso and python-ffc to
       2017.1 in Build-Depends.
   * Move d/libdolfin2016.2.install -> d/libdolfin2017.1.install.
+  * d/patches/python3-support.patch: removed (fixed upstream).
 
  -- Johannes Ring <johannr at simula.no>  Tue, 30 May 2017 13:56:42 +0200
 
diff --git a/debian/patches/python3-support.patch b/debian/patches/python3-support.patch
deleted file mode 100644
index 0634c69..0000000
--- a/debian/patches/python3-support.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -Nru dolfin-2016.2.0.orig/cmake/templates/DOLFINConfig.cmake.in dolfin-2016.2.0/cmake/templates/DOLFINConfig.cmake.in
---- dolfin-2016.2.0.orig/cmake/templates/DOLFINConfig.cmake.in	2017-05-29 18:50:27.456829890 +0200
-+++ dolfin-2016.2.0/cmake/templates/DOLFINConfig.cmake.in	2017-05-29 18:55:01.685153757 +0200
-@@ -5,6 +5,14 @@
- 
- # FIXME: Check that naming conforms to CMake standards
- 
-+if (POLICY CMP0011)
-+  cmake_policy(SET CMP0011 NEW)
-+endif()
-+
-+if (POLICY CMP0012)
-+  cmake_policy(SET CMP0012 NEW)
-+endif()
-+
- # Compute path
- get_filename_component(DOLFIN_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
- 
-@@ -34,17 +42,20 @@
- # Third party include directories
- set(DOLFIN_3RD_PARTY_INCLUDE_DIRS "@DOLFIN_DEP_INCLUDE_DIRECTORIES@;@DOLFIN_DEP_SYSTEM_INCLUDE_DIRECTORIES@")
- 
--# Python include directories
--set(DOLFIN_PYTHON_INCLUDE_DIRS "@NUMPY_INCLUDE_DIR@;@PYTHON_INCLUDE_DIRS@")
--
--# Python definitions
--set(DOLFIN_PYTHON_DEFINITIONS "@DOLFIN_PYTHON_DEFINITIONS@")
--
--# Python libraries
--set(DOLFIN_PYTHON_LIBRARIES "@PYTHON_LIBRARIES@")
--
--# Python executable
--set(DOLFIN_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
-+# Python variables
-+if ("@DOLFIN_ENABLE_PYTHON@" AND "@PYTHON_FOUND@")
-+  if (NOT PYTHON_EXECUTABLE)
-+    set(PYTHON_EXECUTABLE @PYTHON_EXECUTABLE@)
-+  endif()
-+  # Find Python interpreter (defines PYTHON_VERSION)
-+  find_package(PythonInterp)
-+
-+  set(DOLFIN_PYTHON_FILE
-+    "${DOLFIN_CMAKE_DIR}/DOLFINPython${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.cmake")
-+  if (EXISTS "${DOLFIN_PYTHON_FILE}")
-+    include("${DOLFIN_PYTHON_FILE}")
-+  endif()
-+endif()
- 
- # SWIG executable
- set(DOLFIN_SWIG_EXECUTABLE "@SWIG_EXECUTABLE@")
-diff -Nru dolfin-2016.2.0.orig/cmake/templates/DOLFINPythonXY.cmake.in dolfin-2016.2.0/cmake/templates/DOLFINPythonXY.cmake.in
---- dolfin-2016.2.0.orig/cmake/templates/DOLFINPythonXY.cmake.in	1970-01-01 01:00:00.000000000 +0100
-+++ dolfin-2016.2.0/cmake/templates/DOLFINPythonXY.cmake.in	2017-05-29 18:52:30.000974677 +0200
-@@ -0,0 +1,15 @@
-+# - Python variables
-+#
-+# This file has been automatically generated.
-+
-+# Python include directories
-+set(DOLFIN_PYTHON_INCLUDE_DIRS "@NUMPY_INCLUDE_DIR@;@PYTHON_INCLUDE_DIRS@")
-+
-+# Python definitions
-+set(DOLFIN_PYTHON_DEFINITIONS "@DOLFIN_PYTHON_DEFINITIONS@")
-+
-+# Python libraries
-+set(DOLFIN_PYTHON_LIBRARIES "@PYTHON_LIBRARIES@")
-+
-+# Python executable
-+set(DOLFIN_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
-diff -Nru dolfin-2016.2.0.orig/dolfin/CMakeLists.txt dolfin-2016.2.0/dolfin/CMakeLists.txt
---- dolfin-2016.2.0.orig/dolfin/CMakeLists.txt	2017-05-29 18:50:27.460829895 +0200
-+++ dolfin-2016.2.0/dolfin/CMakeLists.txt	2017-05-29 18:54:14.669098264 +0200
-@@ -324,12 +324,15 @@
-   ${CMAKE_BINARY_DIR}/dolfin/DOLFINConfigVersion.cmake @ONLY)
- configure_file(${DOLFIN_CMAKE_DIR}/templates/UseDOLFIN.cmake.in
-   ${CMAKE_BINARY_DIR}/dolfin/UseDOLFIN.cmake @ONLY)
-+configure_file(${DOLFIN_CMAKE_DIR}/templates/DOLFINPythonXY.cmake.in
-+  ${CMAKE_BINARY_DIR}/dolfin/DOLFINPython${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.cmake @ONLY)
- 
- install(
-   FILES
-     ${CMAKE_BINARY_DIR}/dolfin/DOLFINConfig.cmake
-     ${CMAKE_BINARY_DIR}/dolfin/DOLFINConfigVersion.cmake
-     ${CMAKE_BINARY_DIR}/dolfin/UseDOLFIN.cmake
-+    ${CMAKE_BINARY_DIR}/dolfin/DOLFINPython${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.cmake
-     DESTINATION ${DOLFIN_SHARE_DIR}/cmake
-     COMPONENT Development
-     )
diff --git a/debian/patches/series b/debian/patches/series
index c5d62c7..8240355 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-python3-support.patch
 python3-decode.patch

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