[sagemath] 01/01: Update python-userdir patch for install_kernel_spec
Ximin Luo
infinity0 at debian.org
Wed Jul 6 22:35:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository sagemath.
commit 19c107ee764aed2a2fd7af9ddf71bf3762b65121
Author: Ximin Luo <infinity0 at debian.org>
Date: Thu Jul 7 00:30:01 2016 +0200
Update python-userdir patch for install_kernel_spec
---
debian/patches/python_installs_in_userdir.patch | 17 +++++++++++++++++
debian/patches/series | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/debian/patches/python_installs_in_userdir.patch b/debian/patches/python_installs_in_userdir.patch
index 1cfa238..ae785a8 100644
--- a/debian/patches/python_installs_in_userdir.patch
+++ b/debian/patches/python_installs_in_userdir.patch
@@ -1,3 +1,9 @@
+Description: Install Sage spkgs to user's home directory
+ This is a temporary measure to get everything working quickly.
+ Eventually we will get rid of this, and install to debian/tmp via --prefix or --root.
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/Makefile
+++ b/sage/src/Makefile
@@ -3,7 +3,7 @@
@@ -86,3 +92,14 @@
print("Discovered Python/Cython sources, time: %.2f seconds." % (time.time() - t))
+--- a/sage/src/sage/repl/ipython_kernel/install.py
++++ b/sage/src/sage/repl/ipython_kernel/install.py
+@@ -14,7 +14,7 @@
+ SAGE_VERSION
+ )
+ from jupyter_core.paths import ENV_JUPYTER_PATH
+-JUPYTER_PATH = ENV_JUPYTER_PATH[0]
++JUPYTER_PATH = os.path.expanduser("~/.local/share/jupyter")
+
+
+ class SageKernelSpec(object):
diff --git a/debian/patches/series b/debian/patches/series
index 9574bd5..4442701 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,7 @@ silent_debian_bug_780186.patch
silence_ecl_opt_signals.patch
sagedoc_avoid_exception.patch
rubiks_executables_renames.patch
-python_installs_in_userdir.patch
pari.patch
nauty-bin-rename.patch
planarity-update.patch
+python_installs_in_userdir.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git
More information about the debian-science-commits
mailing list