[ffc] 06/08: Add patch for not using --root in setup.py when getting the installation prefix

[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 18b459e930d635190ff7243d28d2295d649587e7
Author: Johannes Ring <johannr at simula.no>
Date:   Mon Jun 27 09:35:16 2016 +0200

    Add patch for not using --root in setup.py when getting the installation prefix
---
 debian/patches/fix-setup.patch | 17 +++++++++++++++++
 debian/patches/series          |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix-setup.patch b/debian/patches/fix-setup.patch
new file mode 100644
index 0000000..baf2360
--- /dev/null
+++ b/debian/patches/fix-setup.patch
@@ -0,0 +1,17 @@
+diff --git a/setup.py b/setup.py
+index d145b3d..db69877 100755
+--- a/setup.py
++++ b/setup.py
+@@ -57,10 +57,10 @@ def get_installation_prefix():
+         if "--user" in arg:
+             import site
+             prefix = site.USER_BASE
+-        elif arg in ("--prefix", "--home", "--root", "--install-base"):
++        elif arg in ("--prefix", "--home", "--install-base"):
+             prefix = sys.argv[sys.argv.index(arg)+1]
+         elif "--prefix=" in arg or "--home=" in arg or \
+-          "--root=" in arg or "--install-base=" in arg:
++          "--install-base=" in arg:
+             prefix = arg.split("=")[1]
+     return os.path.abspath(os.path.expanduser(prefix))
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 44da7ee..5ac2a9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-ufc-config.patch
+fix-setup.patch

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