[sagemath] 09/10: Delete df-sagedoc_avoid_exception.patch and refresh remaining 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 c3e102869e89fe8ae8e628b78fd899634cb3a814
Author: Tobias Hansen <thansen at debian.org>
Date:   Fri Jun 9 22:07:57 2017 +0100

    Delete df-sagedoc_avoid_exception.patch and refresh remaining patches.
---
 debian/changelog                                            |  1 +
 debian/patches/df-sagedoc_avoid_exception.patch             | 12 ------------
 debian/patches/df-silence_ecl_opt_signals.patch             |  4 ++--
 debian/patches/dt-r-no-readline.patch                       |  2 +-
 debian/patches/dt-version-glpk-4.60-extra-hacky-fixes.patch |  2 +-
 debian/patches/series                                       |  1 -
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23e11ad..03f227f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ sagemath (8.0~beta9-1) UNRELEASED; urgency=medium
     - u0-version-singular-4.1.0p3.patch
     - u1-version-ecm-7.patch
     - u1-version-planarity-3.patch
+    - df-sagedoc_avoid_exception.patch
   * Patches with non-trivial modifications:
     - u2-allow-override-sage-local.patch:
       May need further modifications after https://trac.sagemath.org/ticket/21479
diff --git a/debian/patches/df-sagedoc_avoid_exception.patch b/debian/patches/df-sagedoc_avoid_exception.patch
deleted file mode 100644
index 254ed21..0000000
--- a/debian/patches/df-sagedoc_avoid_exception.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/sage/src/sage/misc/sagedoc.py
-+++ b/sage/src/sage/misc/sagedoc.py
-@@ -1579,7 +1579,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'
-+            if hasattr(module, '__name__'):
-+                docstr += 'Definition: ' + module.__name__ + sage_getdef(module) + '\n'
-             pydoc.pager(docstr + _sage_getdoc_unformatted(module))
-         else:
-             python_help(module)
diff --git a/debian/patches/df-silence_ecl_opt_signals.patch b/debian/patches/df-silence_ecl_opt_signals.patch
index 9c8cdaf..491d8d7 100644
--- a/debian/patches/df-silence_ecl_opt_signals.patch
+++ b/debian/patches/df-silence_ecl_opt_signals.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/sage/libs/ecl.pyx
 +++ b/sage/src/sage/libs/ecl.pyx
-@@ -141,7 +141,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
-@@ -156,7 +156,7 @@
+@@ -155,7 +155,7 @@
          ECL_OPT_SIGALTSTACK_SIZE = 1
          ECL_OPT_HEAP_SIZE = ...
          ECL_OPT_HEAP_SAFETY_AREA = ...
diff --git a/debian/patches/dt-r-no-readline.patch b/debian/patches/dt-r-no-readline.patch
index 317a68d..c8bf557 100644
--- a/debian/patches/dt-r-no-readline.patch
+++ b/debian/patches/dt-r-no-readline.patch
@@ -32,7 +32,7 @@ Forwarded: TODO, maybe not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/interfaces/r.py
 +++ b/sage/src/sage/interfaces/r.py
-@@ -331,7 +331,7 @@
+@@ -332,7 +332,7 @@
                    prompt = '> ', #default, later comes the change
  
                    # This is the command that starts up your program
diff --git a/debian/patches/dt-version-glpk-4.60-extra-hacky-fixes.patch b/debian/patches/dt-version-glpk-4.60-extra-hacky-fixes.patch
index 3d6fda0..11cb876 100644
--- a/debian/patches/dt-version-glpk-4.60-extra-hacky-fixes.patch
+++ b/debian/patches/dt-version-glpk-4.60-extra-hacky-fixes.patch
@@ -24,7 +24,7 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/libs/glpk/error.pyx
 +++ b/sage/src/sage/libs/glpk/error.pyx
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
      if glp_at_error():
          # Save error message and skip normal printing
          error_message += s
diff --git a/debian/patches/series b/debian/patches/series
index 4efdf4b..b092cd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,7 +56,6 @@ df-revert-lazy-import-dependent-on-python-patch.patch
 df-revert-minor-feature-dependent-on-python-patch.patch
 df-disable-custom-sphinx-logger.patch
 df-python_security.patch
-df-sagedoc_avoid_exception.patch
 df-sage-gap-reset-doctest.patch
 df-silence_debian_bug_780186.patch
 df-silence_ecl_opt_signals.patch

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