[sagemath] 01/05: Remove dt-version-singular-4-extra-fixes.patch.

[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 c9108c262103e486b8547f7df9f3c88b2752a37e
Author: Tobias Hansen <thansen at debian.org>
Date:   Tue Mar 28 13:20:13 2017 +0100

    Remove dt-version-singular-4-extra-fixes.patch.
---
 debian/changelog                                   |  1 +
 .../dt-version-singular-4-extra-fixes.patch        | 30 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cfe4ec8..189190f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ sagemath (7.6-1) UNRELEASED; urgency=medium
     - u0-use-local-threejs.patch
     - u0-version-pari-2.9.patch
     - u0-version-pynac-0.7.4.patch
+    - dt-version-singular-4-extra-fixes.patch
   * New patches:
     - dt-undo-trac-21267-sagenb-interacts-for-jupyter.patch
 
diff --git a/debian/patches/dt-version-singular-4-extra-fixes.patch b/debian/patches/dt-version-singular-4-extra-fixes.patch
deleted file mode 100644
index 534b8d6..0000000
--- a/debian/patches/dt-version-singular-4-extra-fixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Use -b when running Singular CLI
- Works around upstream Singular bug #775.
- We should also forward this to Sage upstream.
-Author: Ximin Luo <infinity0 at debian.org>
-Bug: https://www.singular.uni-kl.de:8005/trac/ticket/775
-Forwarded: TODO, to Sage
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/src/bin/sage
-+++ b/sage/src/bin/sage
-@@ -303,7 +303,7 @@
- 
- if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
-     shift
--    exec Singular "$@"
-+    exec Singular -t "$@"
- fi
- 
- if [ "$1" = '-sqlite3' -o "$1" = '--sqlite3' ]; then
---- a/sage/src/sage/interfaces/tests.py
-+++ b/sage/src/sage/interfaces/tests.py
-@@ -39,7 +39,7 @@
-     0
-     sage: subprocess.call("echo syntax error | ipython", **kwds) in (0,1)
-     True
--    sage: subprocess.call("echo syntax error | Singular", **kwds)
-+    sage: subprocess.call("echo syntax error | Singular -t", **kwds)
-     0
- """
- from __future__ import print_function
diff --git a/debian/patches/series b/debian/patches/series
index 20dc214..8f33160 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -66,7 +66,6 @@ df-silence_ecl_opt_signals.patch
 # Temporary patches for whatever reason
 # They will eventually be gotten rid of
 dt-disable-parallel-sphinx.patch
-dt-version-singular-4-extra-fixes.patch
 dt-version-glpk-4.60-extra-hacky-fixes.patch
 dt-r-no-readline.patch
 dt-more-fix-test-cases.patch

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