[sagemath] 05/09: Refresh two singular related patches.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit 0a9bbd9db93b457fc5e4af5abf98d50564ac5525
Author: Tobias Hansen <thansen at localhost.localdomain>
Date:   Thu Apr 7 10:23:04 2016 +0100

    Refresh two singular related patches.
---
 debian/patches/singular_build.patch |  8 ++++----
 debian/patches/singular_doc.patch   | 23 +++--------------------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/debian/patches/singular_build.patch b/debian/patches/singular_build.patch
index 8cb7361..e6058d2 100644
--- a/debian/patches/singular_build.patch
+++ b/debian/patches/singular_build.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/bin/sage
 +++ b/sage/src/bin/sage
-@@ -395,7 +395,7 @@
+@@ -459,7 +459,7 @@
  
  if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
      shift
@@ -11,7 +11,7 @@
  if [ "$1" = '-sqlite3' -o "$1" = '--sqlite3' ]; then
 --- a/sage/src/sage/interfaces/singular.py
 +++ b/sage/src/sage/interfaces/singular.py
-@@ -2148,7 +2148,7 @@
+@@ -2248,7 +2248,7 @@
      nodes.clear()
      node_names.clear()
  
@@ -22,7 +22,7 @@
      new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
 --- a/sage/src/sage/libs/singular/singular.pyx
 +++ b/sage/src/sage/libs/singular/singular.pyx
-@@ -712,15 +712,13 @@
+@@ -711,15 +711,13 @@
  
      cdef void *handle = NULL
  
@@ -47,7 +47,7 @@
          raise ImportError, "cannot load libSINGULAR library"
 --- a/sage/src/sage/misc/cython.py
 +++ b/sage/src/sage/misc/cython.py
-@@ -336,7 +336,7 @@
+@@ -305,7 +305,7 @@
  
          sage: code = [
          ... "#clang C++",
diff --git a/debian/patches/singular_doc.patch b/debian/patches/singular_doc.patch
index a642347..246b190 100644
--- a/debian/patches/singular_doc.patch
+++ b/debian/patches/singular_doc.patch
@@ -1,27 +1,10 @@
-(1) I silenced the qepcad doctest
-(2) The second hunk also makes some doctests pass 
+This patch makes some doctests pass 
 but this will have to go when we install system-wide
 and not in the user home.
 
---- a/sage/src/sage/interfaces/qepcad.py
-+++ b/sage/src/sage/interfaces/qepcad.py
-@@ -518,13 +518,6 @@
-     /\
-     x^2 - 3 < 0
- 
--TESTS:
--
--Check the qepcad configuration file::
--
--    sage: open('%s/default.qepcadrc'%SAGE_LOCAL).readlines()[-1]
--    'SINGULAR .../local/bin\n'
--
- AUTHORS:
- 
- - Carl Witty (2008-03): initial version
 --- a/sage/src/sage_setup/find.py
 +++ b/sage/src/sage_setup/find.py
-@@ -97,8 +97,8 @@
+@@ -150,8 +150,8 @@
  
      EXAMPLES::
  
@@ -31,4 +14,4 @@ and not in the user home.
 +        sage: site_packages = getusersitepackages()
          sage: files_by_module = installed_files_by_module(site_packages)
          sage: from sage.misc.sageinspect import loadable_module_extension
-         sage: files_by_module['sage.structure.sage_object'] == \
+         sage: 'sage/structure/sage_object' + loadable_module_extension() in \

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