[sagemath] 01/01: Enable u1-version-ipython-5.4.patch now that 5.5 is in Debian

[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 60f12cf2396c1510522b725b688860c44b28a167
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Nov 9 12:33:40 2017 +0100

    Enable u1-version-ipython-5.4.patch now that 5.5 is in Debian
---
 debian/changelog                            |  4 ++++
 debian/patches/series                       |  2 +-
 debian/patches/u1-version-ipython-5.4.patch | 25 ++++++++++++-------------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9daf150..1f3c5ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,10 @@ sagemath (8.1~beta9-1) UNRELEASED; urgency=medium
   [ Julien Puydt ]
   * Bump d/watch to version 4.
 
+  [ Ximin Luo ]
+  * New patches:
+    - u1-version-ipython-5.4.patch
+
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 16 Oct 2017 20:14:41 +0200
 
 sagemath (8.1~beta7-1) experimental; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index ef07699..e29426f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,7 @@ u1-fix-atrocious-symlink-logic.patch       #22444
 u1-looser-doctest-basename.patch           #22445
 u1-scripts-dir.patch                       #22731
 # Not yet in Debian, uncomment when it is:
-#u1-version-ipython-5.4.patch              #23125
+u1-version-ipython-5.4.patch               #23125
 u1-ipywidgets-repr.patch                   #https://github.com/jupyter-widgets/ipywidgets/pull/1031
 u1-version-giac-1.2.3.57.patch             #TODO
 
diff --git a/debian/patches/u1-version-ipython-5.4.patch b/debian/patches/u1-version-ipython-5.4.patch
index 2a95cd3..8913cc6 100644
--- a/debian/patches/u1-version-ipython-5.4.patch
+++ b/debian/patches/u1-version-ipython-5.4.patch
@@ -4,9 +4,9 @@ Description: Update to IPython 5.4
 Author: Ximin Luo <infinity0 at debian.org>
 Bug: https://trac.sagemath.org/ticket/23125
 
---- a/src/sage/interfaces/sage0.py
-+++ b/src/sage/interfaces/sage0.py
-@@ -160,7 +160,7 @@ class Sage(ExtraTabCompletion, Expect):
+--- a/sage/src/sage/interfaces/sage0.py
++++ b/sage/src/sage/interfaces/sage0.py
+@@ -161,7 +161,7 @@
                  '--no-term-title',
                  '--simple-prompt',
              ])
@@ -15,9 +15,9 @@ Bug: https://trac.sagemath.org/ticket/23125
              if init_code is None:
                  init_code = ['from six.moves import cPickle']
  
---- a/src/sage/repl/configuration.py
-+++ b/src/sage/repl/configuration.py
-@@ -11,7 +11,7 @@ the IPython simple prompt is being used::
+--- a/sage/src/sage/repl/configuration.py
++++ b/sage/src/sage/repl/configuration.py
+@@ -11,7 +11,7 @@
      sage: output = pexpect.run(
      ....:     'bash -c \'echo "{0}" | sage\''.format(cmd),
      ....: )
@@ -26,9 +26,9 @@ Bug: https://trac.sagemath.org/ticket/23125
      True
  """
  
---- a/src/sage/doctest/test.py
-+++ b/src/sage/doctest/test.py
-@@ -360,7 +360,7 @@ Test the ``--debug`` option::
+--- a/sage/src/sage/doctest/test.py
++++ b/sage/src/sage/doctest/test.py
+@@ -379,7 +379,7 @@
          s...: b = 5
          s...: a + b
          8
@@ -37,9 +37,9 @@ Bug: https://trac.sagemath.org/ticket/23125
      <BLANKLINE>
      Returning to doctests...
      **********************************************************************
---- a/src/sage/tests/cmdline.py
-+++ b/src/sage/tests/cmdline.py
-@@ -386,7 +386,7 @@ def test_executable(args, input="", timeout=100.0, **kwds):
+--- a/sage/src/sage/tests/cmdline.py
++++ b/sage/src/sage/tests/cmdline.py
+@@ -387,7 +387,7 @@
          **********************************************************************
          Previously executed commands:
              s...: assert True == False
@@ -48,4 +48,3 @@ Bug: https://trac.sagemath.org/ticket/23125
          <BLANKLINE>
          Returning to doctests...
          **********************************************************************
-

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