[sagemath] 01/01: Remove temp-cython-include-source.patch, should not be needed and does not work for installed packages.

Tobias Hansen thansen at moszumanska.debian.org
Thu Dec 8 20:09:50 UTC 2016


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

thansen pushed a commit to branch master
in repository sagemath.

commit 06c456e0da827a039c636cc72fa3ee68218df43e
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Thu Dec 8 20:09:44 2016 +0000

    Remove temp-cython-include-source.patch, should not be needed and does not work for installed packages.
---
 debian/patches/series                           |  1 -
 debian/patches/temp-cython-include-source.patch | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 7a521e2..6823b75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,7 +54,6 @@ debian-scripts-dir.patch
 # they will eventually be gotten rid of
 temp-pip-nowarn.patch
 temp-disable-parallel-sphinx.patch
-temp-cython-include-source.patch
 version-temp-singular-4-extra-fixes.patch
 version-temp-glpk-4.60-extra-hacky-fixes.patch
 debian-temp-r-no-readline.patch
diff --git a/debian/patches/temp-cython-include-source.patch b/debian/patches/temp-cython-include-source.patch
deleted file mode 100644
index cb96d6e..0000000
--- a/debian/patches/temp-cython-include-source.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Include the Cython headers from the source directory...
- ...if the tests are run from a non-installed sage.
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/sage/src/sage/misc/cython.py
-+++ b/sage/src/sage/misc/cython.py
-@@ -235,7 +235,7 @@
-     additional_source_files, s = parse_keywords('cfile', s)
- 
-     v, s = parse_keywords('cinclude', s)
--    inc = [environ_parse(x.replace('"','').replace("'","")) for x in v] + sage_include_directories()
-+    inc = [environ_parse(x.replace('"','').replace("'","")) for x in v] + sage_include_directories(use_sources=(SAGE_LOCAL != "/usr"))
-     s = """\ninclude "cdefs.pxi"\n""" + s
-     s = """\ninclude "cysignals/signals.pxi"  # ctrl-c interrupt block support\ninclude "stdsage.pxi"\n""" + s
-     args, s = parse_keywords('cargs', s)

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



More information about the debian-science-commits mailing list