[sagemath] 02/06: Start refreshing patches.

Tobias Hansen thansen at moszumanska.debian.org
Tue Aug 9 13:39:35 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 6acd7b1849dea635da1aacf551ff03fdd4e7d29b
Author: Tobias Hansen <thansen at debian.org>
Date:   Tue Aug 9 13:06:33 2016 +0000

    Start refreshing patches.
---
 debian/patches/fixsage-libgap-systemwide.patch |  7 ++++--
 debian/patches/fixsage-mpfi.patch              |  2 +-
 debian/patches/python_security.patch           | 34 +++++++++++++-------------
 debian/patches/sagedoc_avoid_exception.patch   |  2 +-
 debian/patches/silence_ecl_opt_signals.patch   |  4 +--
 debian/patches/version-ipython-5.patch         |  8 +++---
 6 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/debian/patches/fixsage-libgap-systemwide.patch b/debian/patches/fixsage-libgap-systemwide.patch
index 82f47d0..f028c1e 100644
--- a/debian/patches/fixsage-libgap-systemwide.patch
+++ b/debian/patches/fixsage-libgap-systemwide.patch
@@ -87,7 +87,7 @@
      libGAP_Obj libGAP_SUM (libGAP_Obj, libGAP_Obj)
      libGAP_Obj libGAP_DIFF(libGAP_Obj, libGAP_Obj)
      libGAP_Obj libGAP_PROD(libGAP_Obj, libGAP_Obj)
-@@ -278,30 +278,30 @@
+@@ -278,33 +278,33 @@
      bint libGAP_EQ(libGAP_Obj opL, libGAP_Obj opR)
      bint libGAP_LT(libGAP_Obj opL, libGAP_Obj opR)
  
@@ -105,6 +105,9 @@
 -cdef extern from "gap/lists.h":
 +cdef extern from "<gap/lists.h>":
      void libGAP_UNB_LIST(libGAP_Obj list, int pos)
+     bint libGAP_IS_LIST(libGAP_Obj lst)
+     int libGAP_LEN_LIST(libGAP_Obj lst)
+     libGAP_Obj libGAP_ELM_LIST(libGAP_Obj lst, int pos)
  
 -cdef extern from "gap/listfunc.h":
 +cdef extern from "<gap/listfunc.h>":
@@ -124,7 +127,7 @@
      libGAP_Obj libGAP_NEW_PREC(int len)
      int libGAP_LEN_PREC(libGAP_Obj rec)
      int libGAP_GET_RNAM_PREC(libGAP_Obj rec, int i)
-@@ -311,14 +311,14 @@
+@@ -314,14 +314,14 @@
      bint libGAP_IsbPRec(libGAP_Obj rec, libGAP_UInt rnam)
      libGAP_Obj libGAP_ElmPRec(libGAP_Obj rec, libGAP_UInt rnam)
  
diff --git a/debian/patches/fixsage-mpfi.patch b/debian/patches/fixsage-mpfi.patch
index c950713..160f017 100644
--- a/debian/patches/fixsage-mpfi.patch
+++ b/debian/patches/fixsage-mpfi.patch
@@ -36,7 +36,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      bint mpfi_nan_p(mpfi_srcptr)
 --- a/sage/src/sage/rings/real_mpfi.pyx
 +++ b/sage/src/sage/rings/real_mpfi.pyx
-@@ -3136,9 +3136,9 @@
+@@ -3137,9 +3137,9 @@
          elif field.rnd == MPFR_RNDU:
              mpfi_get_right(x.value, self.value)
          elif field.rnd == MPFR_RNDZ:
diff --git a/debian/patches/python_security.patch b/debian/patches/python_security.patch
index cc6dea9..e285db4 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
-@@ -468,19 +468,20 @@
+@@ -559,19 +559,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
-@@ -386,23 +386,24 @@
+@@ -396,23 +396,24 @@
          sage: ret
          1
  
@@ -51,28 +51,28 @@
 -        sage: os.mkdir(d)
 -        sage: os.chmod(d, 0o777)
 -        sage: (out, err, ret) = test_executable(["sage", "-t", "nonexisting.py"], cwd=d)
--        sage: print err
+-        sage: print(err)
 -        Traceback (most recent call last):
 -        ...
 -        RuntimeError: refusing to run doctests...
 -        sage: (out, err, ret) = test_executable(["sage", "-tp", "1", "nonexisting.py"], cwd=d)
--        sage: print err
+-        sage: print(err)
 -        Traceback (most recent call last):
 -        ...
 -        RuntimeError: refusing to run doctests...
-+    #     sage: d = os.path.join(tmp_dir(), "test")
-+    #     sage: os.mkdir(d)
-+    #     sage: os.chmod(d, 0o777)
-+    #     sage: (out, err, ret) = test_executable(["sage", "-t", "nonexisting.py"], cwd=d)
-+    #     sage: print err
-+    #     Traceback (most recent call last):
-+    #     ...
-+    #     RuntimeError: refusing to run doctests...
-+    #     sage: (out, err, ret) = test_executable(["sage", "-tp", "1", "nonexisting.py"], cwd=d)
-+    #     sage: print err
-+    #     Traceback (most recent call last):
-+    #     ...
-+    #     RuntimeError: refusing to run doctests...
++    #    sage: d = os.path.join(tmp_dir(), "test")
++    #    sage: os.mkdir(d)
++    #    sage: os.chmod(d, 0o777)
++    #    sage: (out, err, ret) = test_executable(["sage", "-t", "nonexisting.py"], cwd=d)
++    #    sage: print(err)
++    #    Traceback (most recent call last):
++    #    ...
++    #    RuntimeError: refusing to run doctests...
++    #    sage: (out, err, ret) = test_executable(["sage", "-tp", "1", "nonexisting.py"], cwd=d)
++    #    sage: print(err)
++    #    Traceback (most recent call last):
++    #    ...
++    #    RuntimeError: refusing to run doctests...
  
      Now run a test for the fixdoctests script and, in particular, check that the
      issues raised in :trac:`10589` are fixed. We have to go to slightly silly
diff --git a/debian/patches/sagedoc_avoid_exception.patch b/debian/patches/sagedoc_avoid_exception.patch
index 61d2e25..621a6e2 100644
--- a/debian/patches/sagedoc_avoid_exception.patch
+++ b/debian/patches/sagedoc_avoid_exception.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/sage/misc/sagedoc.py
 +++ b/sage/src/sage/misc/sagedoc.py
-@@ -1550,7 +1550,8 @@
+@@ -1551,7 +1551,8 @@
          if hasattr(module, '_sage_doc_'):
              from sage.misc.sageinspect import sage_getdef, _sage_getdoc_unformatted
              docstr = 'Help on ' + str(module) + '\n'
diff --git a/debian/patches/silence_ecl_opt_signals.patch b/debian/patches/silence_ecl_opt_signals.patch
index ef7da58..491d8d7 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
-@@ -139,7 +139,7 @@
+@@ -140,7 +140,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
-@@ -154,7 +154,7 @@
+@@ -155,7 +155,7 @@
          ECL_OPT_SIGALTSTACK_SIZE = 1
          ECL_OPT_HEAP_SIZE = ...
          ECL_OPT_HEAP_SAFETY_AREA = ...
diff --git a/debian/patches/version-ipython-5.patch b/debian/patches/version-ipython-5.patch
index 96806ea..4c4e6fb 100644
--- a/debian/patches/version-ipython-5.patch
+++ b/debian/patches/version-ipython-5.patch
@@ -3,7 +3,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
 
 --- a/sage/src/sage/repl/interpreter.py
 +++ b/sage/src/sage/repl/interpreter.py
-@@ -103,6 +103,7 @@
+@@ -107,6 +107,7 @@
  import re
  import sys
  from sage.repl.preparse import preparse
@@ -11,7 +11,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
  
  from traitlets.config.loader import Config
  from traitlets import Bool, Type
-@@ -385,11 +386,6 @@
+@@ -375,11 +376,6 @@
  ###################################################################
  
  DEFAULT_SAGE_CONFIG = Config(
@@ -23,7 +23,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
      TerminalIPythonApp = Config(
          display_banner = False,
          verbose_crash = True,
-@@ -397,6 +393,7 @@
+@@ -387,6 +383,7 @@
          shell_class = SageTerminalInteractiveShell,
      ),
      InteractiveShell = Config(
@@ -31,7 +31,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
          ast_node_interactivity = 'all',
          colors = 'LightBG' if sys.stdout.isatty() else 'NoColor',
          confirm_exit = False,
-@@ -630,13 +627,11 @@
+@@ -620,13 +617,11 @@
          cfg = copy.deepcopy(get_ipython().config)
      except NameError:
          cfg = copy.deepcopy(DEFAULT_SAGE_CONFIG)

-- 
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