[ffc] 01/01: Revert change to make the alternative a directory symlink and instead add a slave for ufc_geometry.h file.

[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 aa5314908dbf3e969b8cee5a408c558e480076d2
Author: Johannes Ring <johannr at simula.no>
Date:   Mon Jun 12 19:33:35 2017 +0200

    Revert change to make the alternative a directory symlink and instead add a slave for ufc_geometry.h file.
    
    Update patch to use /usr/include instead of /usr/include/ufc for path to ufc header files.
---
 debian/changelog                      | 6 +++---
 debian/patches/ufc-include-path.patch | 6 +++---
 debian/python-ffc.postinst            | 3 ++-
 debian/python-ffc.prerm               | 2 +-
 debian/python3-ffc.postinst           | 3 ++-
 debian/python3-ffc.prerm              | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef3e39d..eda77e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +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
+  * d/patches/ufc-include-path.patch: Add patch to use /usr/include
     as path to ufc header files.
 
   [ Drew Parsons ]
   * Enable python3-only installations by using alternatives for
-    ufc header files in /usr/include/ufc (provided by either python-ffc
-    or python3-ffc). The ufc header files are used by libdolfin-dev.
+    /usr/include/ufc.h (provided by either python-ffc or python3-ffc).
+    ufc.h is used by libdolfin-dev.
 
  -- Drew Parsons <dparsons at debian.org>  Thu, 08 Jun 2017 11:54:31 +0800
 
diff --git a/debian/patches/ufc-include-path.patch b/debian/patches/ufc-include-path.patch
index 9c30209..66134ec 100644
--- a/debian/patches/ufc-include-path.patch
+++ b/debian/patches/ufc-include-path.patch
@@ -1,8 +1,8 @@
-Description: Use /usr/include/ufc as include path for ufc
+Description: Use /usr/include 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
+Last-Update: 2017-06-12
 
 --- ffc-2016.2.0.orig/ffc/backends/ufc/__init__.py
 +++ ffc-2016.2.0/ffc/backends/ufc/__init__.py
@@ -10,7 +10,7 @@ Last-Update: 2017-06-09
  # 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"
++_include_path = "/usr/include"
  
  def get_include_path():
      "Return location of UFC header files"
diff --git a/debian/python-ffc.postinst b/debian/python-ffc.postinst
index c5b1cca..d8778db 100644
--- a/debian/python-ffc.postinst
+++ b/debian/python-ffc.postinst
@@ -5,7 +5,8 @@ UFC_INCLUDE_DIR=__PYTHON_UFC_DIR__
 # Make alternatives links
 if [ "$1" = "configure" ]; then
   # alternative ufc.h
-  update-alternatives --install /usr/include/ufc ufc ${UFC_INCLUDE_DIR}/ 150
+  update-alternatives --install /usr/include/ufc.h ufc.h ${UFC_INCLUDE_DIR}/ufc.h 150 \
+    --slave /usr/include/ufc_geometry.h ufc_geometry.h ${UFC_INCLUDE_DIR}/ufc_geometry.h 
 fi
 
 #DEBHELPER#
diff --git a/debian/python-ffc.prerm b/debian/python-ffc.prerm
index b730f2d..88ae2ed 100644
--- a/debian/python-ffc.prerm
+++ b/debian/python-ffc.prerm
@@ -4,7 +4,7 @@ UFC_INCLUDE_DIR=__PYTHON_UFC_DIR__
 
 # Remove alternatives links
 if [ "$1" = "remove" ]; then
-  update-alternatives --remove ufc ${UFC_INCLUDE_DIR}/
+  update-alternatives --remove ufc.h ${UFC_INCLUDE_DIR}/ufc.h
 fi
 
 #DEBHELPER#
diff --git a/debian/python3-ffc.postinst b/debian/python3-ffc.postinst
index 26221a0..947f3f2 100644
--- a/debian/python3-ffc.postinst
+++ b/debian/python3-ffc.postinst
@@ -5,7 +5,8 @@ UFC_INCLUDE_DIR=__PYTHON3_UFC_DIR__
 # Make alternatives links
 if [ "$1" = "configure" ]; then
   # alternative ufc.h
-  update-alternatives --install /usr/include/ufc ufc ${UFC_INCLUDE_DIR}/ 100
+  update-alternatives --install /usr/include/ufc.h ufc.h ${UFC_INCLUDE_DIR}/ufc.h 100 \
+    --slave /usr/include/ufc_geometry.h ufc_geometry.h ${UFC_INCLUDE_DIR}/ufc_geometry.h 
 fi
 
 #DEBHELPER#
diff --git a/debian/python3-ffc.prerm b/debian/python3-ffc.prerm
index e003ec9..f087cf0 100644
--- a/debian/python3-ffc.prerm
+++ b/debian/python3-ffc.prerm
@@ -4,7 +4,7 @@ UFC_INCLUDE_DIR=__PYTHON3_UFC_DIR__
 
 # Remove alternatives links
 if [ "$1" = "remove" ]; then
-  update-alternatives --remove ufc ${UFC_INCLUDE_DIR}/
+  update-alternatives --remove ufc.h ${UFC_INCLUDE_DIR}/ufc.h
 fi
 
 #DEBHELPER#

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