[dolfin] 01/03: Update debian.patches

[Drew Parsons]

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

dparsons pushed a commit to branch experimental
in repository dolfin.

commit 4947038cf5ad513de05999159c3a479742746850
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat Oct 7 16:33:22 2017 +0800

    Update debian.patches
    
    - file encoding now included when reading files in python scripts
    - VTK no longer supported
---
 debian/changelog                                   |  3 +++
 debian/patches/python3-decode.patch                | 30 ----------------------
 debian/patches/series                              |  2 --
 .../patches/vtk-python2-only-cmake-usefile.patch   | 12 ---------
 4 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ce86b0..00ef09a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ dolfin (2017.2.0-1) UNRELEASED; urgency=medium
     - updated debian/upstream/signing-key.asc for signature
       from the FEniCS Project Steering Council (key BED06106DD22BAB3)
   * Standards-Version: 4.1.1
+  * Update debian.patches
+    - file encoding now included when reading files in python scripts
+    - VTK no longer supported
 
  -- Drew Parsons <dparsons at debian.org>  Sat, 07 Oct 2017 15:36:09 +0800
 
diff --git a/debian/patches/python3-decode.patch b/debian/patches/python3-decode.patch
deleted file mode 100644
index 70e99a1..0000000
--- a/debian/patches/python3-decode.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/cmake/scripts/generate-swig-interface.py b/cmake/scripts/generate-swig-interface.py
-index 843a492..78bbd6f 100644
---- a/cmake/scripts/generate-swig-interface.py
-+++ b/cmake/scripts/generate-swig-interface.py
-@@ -212,8 +212,8 @@ def extract_swig_modules_dependencies(module_to_submodules, submodule_info):
-                     continue
- 
-                 # Read code
--                with open(header_file) as f:
--                    code = f.read()
-+                with open(header_file, 'rb') as f:
-+                    code = f.read().decode('utf-8')
- 
-                 try:
-                     # Extract type info
-diff --git a/site-packages/dolfin_utils/documentation/extractdocumentation.py b/site-packages/dolfin_utils/documentation/extractdocumentation.py
-index eeaa1b5..ca40ca3 100644
---- a/site-packages/dolfin_utils/documentation/extractdocumentation.py
-+++ b/site-packages/dolfin_utils/documentation/extractdocumentation.py
-@@ -49,8 +49,9 @@ def extract_documentation(dolfin_dir, header, module):
-     indent = 0
- 
-     # Iterate over each line
--    f = open(os.path.join(dolfin_dir, "dolfin", module, header))
-+    f = open(os.path.join(dolfin_dir, "dolfin", module, header), 'rb')
-     for line in f:
-+        line = line.decode('utf-8')
- 
-         # Check for comment
-         if "///" in line:
diff --git a/debian/patches/series b/debian/patches/series
index a61e443..bee2a36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-python3-decode.patch
-vtk-python2-only-cmake-usefile.patch
 conditional-parmetis-in-cholmod.patch
 FindPETScSLEPc.patch
diff --git a/debian/patches/vtk-python2-only-cmake-usefile.patch b/debian/patches/vtk-python2-only-cmake-usefile.patch
deleted file mode 100644
index 5965432..0000000
--- a/debian/patches/vtk-python2-only-cmake-usefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru dolfin-2016.2.0.orig/cmake/templates/UseDOLFIN.cmake.in dolfin-2016.2.0/cmake/templates/UseDOLFIN.cmake.in
---- dolfin-2016.2.0.orig/cmake/templates/UseDOLFIN.cmake.in	2017-05-29 18:50:27.456829890 +0200
-+++ dolfin-2016.2.0/cmake/templates/UseDOLFIN.cmake.in	2017-06-01 10:40:07.542728575 +0200
-@@ -16,7 +16,7 @@
-   # Need to get VTK config because VTK uses advanced VTK features
-   # which mean it's not enough to just link to the DOLFIN target. See
-   # http://www.vtk.org/pipermail/vtk-developers/2013-October/014402.html
--  if (@VTK_FOUND@)
-+  if (@VTK_FOUND@ AND "${PYTHON_VERSION_MAJOR}" STREQUAL "2")
-     find_package(VTK HINTS ${VTK_DIR} $ENV{VTK_DIR} NO_MODULE QUIET)
-     if (VTK_FOUND)
-       include(${VTK_USE_FILE})

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