[sagemath] 01/02: Split the patches to install python in userdir in a new patch

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository sagemath.

commit 79d6be8e77797c76eaf8fc46b6a4aa1e49310c2b
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Sat Mar 14 13:21:24 2015 +0100

    Split the patches to install python in userdir in a new patch
---
 debian/patches/python_installs_in_userdir.patch | 33 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 debian/patches/unbreak.patch                    | 31 -----------------------
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/debian/patches/python_installs_in_userdir.patch b/debian/patches/python_installs_in_userdir.patch
new file mode 100644
index 0000000..c0fd756
--- /dev/null
+++ b/debian/patches/python_installs_in_userdir.patch
@@ -0,0 +1,33 @@
+--- a/sage/build/deps
++++ b/sage/build/deps
+@@ -519,7 +519,7 @@
+ 		 $(INST)/csage
+ 	if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
+ 		cd $(SAGE_SRC) && source bin/sage-env && \
+-		$(PIPE) 'time python setup.py install 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
++		$(PIPE) 'time python setup.py install --user 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
+ 		touch $@; \
+ 	fi
+ 
+--- a/sage/src/bin/sage-build
++++ b/sage/src/bin/sage-build
+@@ -27,4 +27,4 @@
+ 
+ # build sage library
+ cd "$SAGE_SRC"
+-python setup.py install
++python setup.py install --user
+--- a/sage/build/pkgs/sagenb/spkg-install
++++ b/sage/build/pkgs/sagenb/spkg-install
+@@ -40,9 +40,9 @@
+ 
+ # Install dependencies
+ for PKG in $(cat src/install_order); do
+-    easy_install -H None "src/$PKG" || die "Error installing $PKG !"
++    easy_install --user -H None "src/$PKG" || die "Error installing $PKG !"
+ done
+ PKG=$(ls -1 src | GREP_OPTIONS= grep sagenb-)
+ 
+ # Install sagenb into site-packages
+-easy_install -H None "src/$PKG" || die "Error installing sagenb !"
++easy_install --user -H None "src/$PKG" || die "Error installing sagenb !"
diff --git a/debian/patches/series b/debian/patches/series
index 05e999f..fbe799f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ silence_ecl_opt_interrupt_signal.patch
 sagedoc_avoid_exception.patch
 silence_matplotlib_1_3_changes.patch
 rubiks_executables_renames.patch
+python_installs_in_userdir.patch
diff --git a/debian/patches/unbreak.patch b/debian/patches/unbreak.patch
index 0d4aa4c..b964ad9 100644
--- a/debian/patches/unbreak.patch
+++ b/debian/patches/unbreak.patch
@@ -9,29 +9,6 @@
  PIPE = $(SAGE_ROOT)/build/pipestatus
  
  # Tell make not to look for files with these names:
-@@ -519,7 +519,7 @@
- 		 $(INST)/csage
- 	if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
- 		cd $(SAGE_SRC) && source bin/sage-env && \
--		$(PIPE) 'time python setup.py install 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
-+		$(PIPE) 'time python setup.py install --user 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
- 		touch $@; \
- 	fi
- 
---- a/sage/build/pkgs/sagenb/spkg-install
-+++ b/sage/build/pkgs/sagenb/spkg-install
-@@ -40,9 +40,9 @@
- 
- # Install dependencies
- for PKG in $(cat src/install_order); do
--    easy_install -H None "src/$PKG" || die "Error installing $PKG !"
-+    easy_install --user -H None "src/$PKG" || die "Error installing $PKG !"
- done
- PKG=$(ls -1 src | GREP_OPTIONS= grep sagenb-)
- 
- # Install sagenb into site-packages
--easy_install -H None "src/$PKG" || die "Error installing sagenb !"
-+easy_install --user -H None "src/$PKG" || die "Error installing sagenb !"
 --- a/sage/src/bin/sage
 +++ b/sage/src/bin/sage
 @@ -287,16 +287,16 @@
@@ -70,14 +47,6 @@
  fi
  
  if [ "$1" = '-sqlite3' -o "$1" = '--sqlite3' ]; then
---- a/sage/src/bin/sage-build
-+++ b/sage/src/bin/sage-build
-@@ -27,4 +27,4 @@
- 
- # build sage library
- cd "$SAGE_SRC"
--python setup.py install
-+python setup.py install --user
 --- a/sage/src/bin/sage-env
 +++ b/sage/src/bin/sage-env
 @@ -247,8 +247,8 @@

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