[sagemath] 06/09: Refresh some 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 bcbc881c34fe09da2e010e80e10724b0d575c948
Author: Tobias Hansen <thansen at localhost.localdomain>
Date:   Thu Apr 7 10:26:54 2016 +0100

    Refresh some patches.
---
 debian/patches/python_security.patch          | 4 ++--
 debian/patches/sagedoc_avoid_exception.patch  | 4 ++--
 debian/patches/silence_ecl_opt_signals.patch  | 4 ++--
 debian/patches/silent_debian_bug_780186.patch | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/python_security.patch b/debian/patches/python_security.patch
index 8d789ed..d31a9d0 100644
--- a/debian/patches/python_security.patch
+++ b/debian/patches/python_security.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/sage/doctest/control.py
 +++ b/sage/src/sage/doctest/control.py
-@@ -451,19 +451,20 @@
+@@ -469,19 +469,20 @@
          ``sage/tests/cmdline.py`` for a doctest that this works, see
          also :trac:`13579`.
  
@@ -35,7 +35,7 @@
          with open(os.devnull, 'w') as dev_null:
 --- a/sage/src/sage/tests/cmdline.py
 +++ b/sage/src/sage/tests/cmdline.py
-@@ -373,23 +373,24 @@
+@@ -386,23 +386,24 @@
          sage: ret
          1
  
diff --git a/debian/patches/sagedoc_avoid_exception.patch b/debian/patches/sagedoc_avoid_exception.patch
index 0510eab..298f6c4 100644
--- a/debian/patches/sagedoc_avoid_exception.patch
+++ b/debian/patches/sagedoc_avoid_exception.patch
@@ -1,10 +1,10 @@
 --- a/sage/src/sage/misc/sagedoc.py
 +++ b/sage/src/sage/misc/sagedoc.py
-@@ -1446,7 +1446,8 @@
+@@ -1547,7 +1547,8 @@
          if hasattr(module, '_sage_doc_'):
              from sage.misc.sageinspect import sage_getdef, _sage_getdoc_unformatted
              docstr = 'Help on ' + str(module) + '\n'
--            docstr += 'Definition: ' + module.__name__ + sage_getdef(module) + '\n' 
+-            docstr += 'Definition: ' + module.__name__ + sage_getdef(module) + '\n'
 +            if hasattr(module, '__name__'):
 +                docstr += 'Definition: ' + module.__name__ + sage_getdef(module) + '\n'
              pydoc.pager(docstr + _sage_getdoc_unformatted(module))
diff --git a/debian/patches/silence_ecl_opt_signals.patch b/debian/patches/silence_ecl_opt_signals.patch
index 8d75f1b..ef7da58 100644
--- a/debian/patches/silence_ecl_opt_signals.patch
+++ b/debian/patches/silence_ecl_opt_signals.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/sage/libs/ecl.pyx
 +++ b/sage/src/sage/libs/ecl.pyx
-@@ -136,7 +136,7 @@
+@@ -139,7 +139,7 @@
          ECL_OPT_TRAP_SIGBUS = 1
          ECL_OPT_TRAP_SIGCHLD = 0
          ECL_OPT_TRAP_SIGPIPE = 1
@@ -9,7 +9,7 @@
          ECL_OPT_SIGNAL_HANDLING_THREAD = 0
          ECL_OPT_SIGNAL_QUEUE_SIZE = 16
          ECL_OPT_BOOTED = 1
-@@ -151,7 +151,7 @@
+@@ -154,7 +154,7 @@
          ECL_OPT_SIGALTSTACK_SIZE = 1
          ECL_OPT_HEAP_SIZE = ...
          ECL_OPT_HEAP_SAFETY_AREA = ...
diff --git a/debian/patches/silent_debian_bug_780186.patch b/debian/patches/silent_debian_bug_780186.patch
index 6766fc0..6682404 100644
--- a/debian/patches/silent_debian_bug_780186.patch
+++ b/debian/patches/silent_debian_bug_780186.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/sage/ext/memory.pyx
 +++ b/sage/src/sage/ext/memory.pyx
-@@ -2,17 +2,6 @@
+@@ -1,17 +1,6 @@
  """
  Low-level memory allocation functions
  

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