[ffc] 06/12: Remove patch (no longer needed)

Johannes Ring johannr-guest at moszumanska.debian.org
Thu Dec 1 20:27:37 UTC 2016


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

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

commit 7b0c3fe291050422a8bb7c0651aaaa1704936d6b
Author: Johannes Ring <johannr at simula.no>
Date:   Thu Dec 1 20:34:51 2016 +0100

    Remove patch (no longer needed)
---
 debian/changelog               |  1 +
 debian/patches/fix-setup.patch | 17 -----------------
 debian/patches/series          |  1 -
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3e70cf..1a33ea9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ffc (2016.2.0-1) UNRELEASED; urgency=medium
   * d/control:
     - Remove Christophe Prud'homme from Uploaders (closes: #835006).
     - Add python-setuptools and dh-python to Build-Depends.
+  * Remove patch (fixed in new upstream release).
 
  -- Johannes Ring <johannr at simula.no>  Thu, 01 Dec 2016 20:16:46 +0100
 
diff --git a/debian/patches/fix-setup.patch b/debian/patches/fix-setup.patch
deleted file mode 100644
index baf2360..0000000
--- a/debian/patches/fix-setup.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 5ac2a9b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-setup.patch

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



More information about the debian-science-commits mailing list