[ffc] 02/02: Add patch to use /usr/include/ufc as path to ufc header files

[Johannes Ring]

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

johannr-guest pushed a commit to branch master
in repository ffc.

commit 8479c03f9a11fae2c984ff5c5c00070cfe3acc0e
Author: Johannes Ring <johannr at simula.no>
Date:   Mon Jun 12 13:54:50 2017 +0200

    Add patch to use /usr/include/ufc as path to ufc header files
---
 debian/changelog                      |  9 +++++++--
 debian/patches/series                 |  1 +
 debian/patches/ufc-include-path.patch | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7f18ec..ef3e39d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 ffc (2016.2.0-4) UNRELEASED; urgency=medium
 
+  [ Johannes Ring ]
+  * d/patches/ufc-include-path.patch: Add patch to use /usr/include/ufc
+    as path to ufc header files.
+
+  [ Drew Parsons ]
   * Enable python3-only installations by using alternatives for
-    /usr/include/ufc.h (provided by either python-ffc or python3-ffc).
-    ufc.h is used by libdolfin-dev.
+    ufc header files in /usr/include/ufc (provided by either python-ffc
+    or python3-ffc). The ufc header files are used by libdolfin-dev.
 
  -- Drew Parsons <dparsons at debian.org>  Thu, 08 Jun 2017 11:54:31 +0800
 
diff --git a/debian/patches/series b/debian/patches/series
index ecba226..6abd448 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-float-division.patch
+ufc-include-path.patch
diff --git a/debian/patches/ufc-include-path.patch b/debian/patches/ufc-include-path.patch
new file mode 100644
index 0000000..9c30209
--- /dev/null
+++ b/debian/patches/ufc-include-path.patch
@@ -0,0 +1,16 @@
+Description: Use /usr/include/ufc as include path for ufc
+ Upstream is not interested in switching to this path.
+Forwarded: not-needed
+Author: Johannes Ring <johannr at simula.no>
+Last-Update: 2017-06-09
+
+--- ffc-2016.2.0.orig/ffc/backends/ufc/__init__.py
++++ ffc-2016.2.0/ffc/backends/ufc/__init__.py
+@@ -62,6 +62,7 @@ from ffc.backends.ufc.form import *
+ # Get abspath on import, it can in some cases be
+ # a relative path w.r.t. curdir on startup
+ _include_path = os.path.dirname(os.path.abspath(__file__))
++_include_path = "/usr/include/ufc"
+ 
+ def get_include_path():
+     "Return location of UFC header files"

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