[sagemath] 02/02: Remove patches for spkgs we're no longer using (because we're using the Debian packages instead)

[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 cbb8540e3b6f7303690b193b726f2df3a121235e
Author: Ximin Luo <infinity0 at debian.org>
Date:   Wed Jul 6 09:53:34 2016 +0200

    Remove patches for spkgs we're no longer using (because we're using the Debian packages instead)
---
 debian/patches/remove_singular_warning.patch | 21 ---------------------
 debian/patches/series                        |  2 --
 debian/patches/spkg_ipython_fix.patch        | 18 ------------------
 3 files changed, 41 deletions(-)

diff --git a/debian/patches/remove_singular_warning.patch b/debian/patches/remove_singular_warning.patch
deleted file mode 100644
index 29ca429..0000000
--- a/debian/patches/remove_singular_warning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- /dev/null
-+++ b/sage/build/pkgs/singular/patches/remove_warning.patch
-@@ -0,0 +1,18 @@
-+diff -uri latest/kernel/mod_raw.cc latest.tmp/kernel/mod_raw.cc
-+--- latest/kernel/mod_raw.cc	2014-11-19 14:06:05.000000000 +0100
-++++ latest.tmp/kernel/mod_raw.cc	2015-03-08 00:32:55.489679509 +0100
-+@@ -150,10 +150,10 @@
-+     handle = dynl_open(path_name);
-+     if (handle == NULL && ! warn_handle)
-+     {
-+-      Warn("Could not open dynamic library: %s", path_name);
-+-      Warn("Error message from system: %s", dynl_error());
-+-      if (msg != NULL) Warn("%s", msg);
-+-      Warn("See the INSTALL section in the Singular manual for details.");
-++      //Warn("Could not open dynamic library: %s", path_name);
-++      //Warn("Error message from system: %s", dynl_error());
-++      //if (msg != NULL) Warn("%s", msg);
-++      //Warn("See the INSTALL section in the Singular manual for details.");
-+       warn_handle = TRUE;
-+     }
-+   }
diff --git a/debian/patches/series b/debian/patches/series
index 6877831..4636cf3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 unbreak.patch
 maxima.patch
-remove_singular_warning.patch
 singular_build.patch
 singular_doc.patch
 python_security.patch
@@ -10,5 +9,4 @@ sagedoc_avoid_exception.patch
 rubiks_executables_renames.patch
 python_installs_in_userdir.patch
 pari.patch
-spkg_ipython_fix.patch
 nauty-bin-rename.patch
diff --git a/debian/patches/spkg_ipython_fix.patch b/debian/patches/spkg_ipython_fix.patch
deleted file mode 100644
index e7f7e21..0000000
--- a/debian/patches/spkg_ipython_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/sage/build/pkgs/ipython/spkg-install
-+++ b/sage/build/pkgs/ipython/spkg-install
-@@ -27,14 +27,7 @@
-     exit 1
- fi
- 
--echo "Removing old version of IPython..."
--rm -rf "$SAGE_LOCAL/lib/python/site-packages/IPython"
--if [ $? -ne 0 ]; then
--    echo >&2 "Error deleting previous version"
--    exit 1
--fi
--
--python setup.py install
-+python setup.py install --user
- if [ $? -ne 0 ]; then
-     echo >&2 "Error installing IPython"
-     exit 1

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