[sagemath] 02/04: Update patches for Sage 7.1

[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 47d21c86e4654e520ad0f2d6a11ed2ab3255d46d
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jul 5 22:09:16 2016 +0200

    Update patches for Sage 7.1
---
 debian/patches/python_installs_in_userdir.patch | 66 +++++++++++++++++--------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/debian/patches/python_installs_in_userdir.patch b/debian/patches/python_installs_in_userdir.patch
index b99c297..6e1f7a4 100644
--- a/debian/patches/python_installs_in_userdir.patch
+++ b/debian/patches/python_installs_in_userdir.patch
@@ -1,23 +1,3 @@
---- a/sage/build/pkgs/sagenb/spkg-install
-+++ b/sage/build/pkgs/sagenb/spkg-install
-@@ -51,7 +51,7 @@
- 
- # Install dependencies
- for PKG in $(cat src/install_order); do
--    easy_install -Z -H None "src/$PKG"
-+    easy_install --user -Z -H None "src/$PKG"
-     if [ $? -ne 0 ]; then
-         echo >&2 "Error: Installing $PKG failed."
-         exit 1
-@@ -61,7 +61,7 @@
- 
- # Install sagenb into site-packages
- PKG=$(ls -1 src | GREP_OPTIONS= grep sagenb-)
--easy_install -Z -H None "src/$PKG"
-+easy_install --user -Z -H None "src/$PKG"
- if [ $? -ne 0 ]; then
-     echo >&2 "Error: Installing SageNB failed."
-     exit 1
 --- a/sage/src/Makefile
 +++ b/sage/src/Makefile
 @@ -3,7 +3,7 @@
@@ -29,3 +9,49 @@
  
  clean:
  	@echo "Deleting Sage library build artifacts..."
+--- a/sage/build/pkgs/ipywidgets/spkg-install
++++ b/sage/build/pkgs/ipywidgets/spkg-install
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env bash
+ 
+-cd src && python setup.py install
++cd src && python setup.py install --user
+--- a/sage/build/pkgs/nbconvert/spkg-install
++++ b/sage/build/pkgs/nbconvert/spkg-install
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env bash
+ 
+-cd src && python setup.py install
++cd src && python setup.py install --user
+--- a/sage/build/pkgs/nbformat/spkg-install
++++ b/sage/build/pkgs/nbformat/spkg-install
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env bash
+ 
+-cd src && python setup.py install
++cd src && python setup.py install --user
+--- a/sage/build/pkgs/notebook/spkg-install
++++ b/sage/build/pkgs/notebook/spkg-install
+@@ -12,7 +12,7 @@
+ done
+ 
+ 
+-python setup.py install
++python setup.py install --user
+ 
+ # Install the Jupyter notebook configuration
+ ETC_JUPYTER="$SAGE_ETC"/jupyter
+--- /dev/null
++++ b/sage/build/pkgs/cysignals/patches/install-in-userdir.patch
+@@ -0,0 +1,11 @@
++--- src/Makefile	2016-07-05 22:05:29.575454638 +0200
+++++ src/Makefile	2016-07-05 22:05:33.495567646 +0200
++@@ -8,7 +8,7 @@
++ 	$(PYTHON) setup.py build
++ 
++ install: build
++-	$(PYTHON) setup.py install
+++	$(PYTHON) setup.py install --user
++ 
++ dist: configure
++ 	chmod go+rX-w -R .

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