[sagemath] 01/01: Actually, this is more to do with sage's patched Cython rather than cysignals

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagemath.

commit 5177ecfc9e3fa2e57990d5104fe95f9a01174622
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sat Oct 1 17:34:34 2016 +0200

    Actually, this is more to do with sage's patched Cython rather than cysignals
---
 debian/patches/debian-cysignals-include-path.patch | 10 ----------
 debian/patches/debian-cython-sys-path.patch        | 10 ++++++++++
 debian/patches/series                              |  1 -
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/patches/debian-cysignals-include-path.patch b/debian/patches/debian-cysignals-include-path.patch
deleted file mode 100644
index 2afa7bd..0000000
--- a/debian/patches/debian-cysignals-include-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/sage/src/sage/misc/cython.py
-+++ b/sage/src/sage/misc/cython.py
-@@ -241,6 +241,7 @@
-     for path in sys.path:
-         cysignals_path = os.path.join(path, "cysignals")
-         if os.path.isdir(cysignals_path):
-+            inc.append(path)
-             inc.append(cysignals_path)
- 
-     return s, libs, inc, lang, additional_source_files, args, libdirs
diff --git a/debian/patches/debian-cython-sys-path.patch b/debian/patches/debian-cython-sys-path.patch
index a9b3a66..092df11 100644
--- a/debian/patches/debian-cython-sys-path.patch
+++ b/debian/patches/debian-cython-sys-path.patch
@@ -13,3 +13,13 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
          compiler_directives={
              'embedsignature': True,
              'profile': profile,
+--- a/sage/src/sage/misc/cython.py
++++ b/sage/src/sage/misc/cython.py
+@@ -239,6 +239,7 @@
+ 
+     # Add cysignals directory to includes
+     for path in sys.path:
++        inc.append(path)
+         cysignals_path = os.path.join(path, "cysignals")
+         if os.path.isdir(cysignals_path):
+             inc.append(cysignals_path)
diff --git a/debian/patches/series b/debian/patches/series
index eed80ec..49f8d45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,7 +32,6 @@ debian-cython-sys-path.patch
 debian-sage-env.patch
 debian-octave.patch
 debian-no-singular-hlp.patch
-debian-cysignals-include-path.patch
 
 # temporary patches for whatever reason
 # they will eventually be gotten rid of

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