[sagemath] 02/02: Update python-userdir patch for install_data and list remaining tasks

[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 86e6027aa47c48dd109afc0f94fe97961e92100a
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Jul 7 00:06:21 2016 +0200

    Update python-userdir patch for install_data and list remaining tasks
---
 debian/README.Debian                            | 17 +++++++++++++++++
 debian/patches/python_installs_in_userdir.patch | 21 +++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 1ac4b72..add9371 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,3 +2,20 @@
 
 See https://wiki.debian.org/DebianScience/Sage
 for instructions on using this repository.
+
+## TODO
+
+1. patch lrcalc:
+
+schublib.h, symfcn.h need to #include "hashtab.h" (etc) instead of <hashtab.h>
+
+2. patch flint-arb:
+
+see https://github.com/fredrik-johansson/arb/pull/55
+
+also need sage to -lflint-arb instead of -larb (or perhaps Debian needs to
+install it as libarb.so; check upstream to see what they prefer)
+
+3. package all the stuff not yet available in Debian
+
+i.e. for which pruner.py says "X will not come from debian!"
diff --git a/debian/patches/python_installs_in_userdir.patch b/debian/patches/python_installs_in_userdir.patch
index 30c3d3e..1cfa238 100644
--- a/debian/patches/python_installs_in_userdir.patch
+++ b/debian/patches/python_installs_in_userdir.patch
@@ -57,11 +57,19 @@
 + 	chmod go+rX-w -R .
 --- a/sage/src/setup.py
 +++ b/sage/src/setup.py
-@@ -595,6 +595,11 @@
+@@ -46,6 +46,7 @@
+ 
+ from module_list import ext_modules, library_order, aliases
+ from sage.env import *
++SAGE_USER_LIB = os.path.expanduser("~/.sage/local/lib/python2.7/site-packages")
+ 
+ #########################################################
+ ### Configuration
+@@ -595,6 +596,11 @@
              'embedsignature': True,
              'profile': profile,
          })
-+    cysignals_user_path = os.path.expanduser("~/.sage/local/lib/python2.7/site-packages/cysignals")
++    cysignals_user_path = os.path.join(SAGE_USER_LIB, "cysignals")
 +    for m in ext_modules:
 +        for i, p in enumerate(m.include_dirs):
 +            if p.endswith("/cysignals"):
@@ -69,3 +77,12 @@
  
      open(version_file, 'w').write(version_stamp)
  
+@@ -615,7 +621,7 @@
+ python_packages, python_modules = find_python_sources(
+     SAGE_SRC, ['sage', 'sage_setup'])
+ python_data_files = find_extra_files(python_packages,
+-    ".", SAGE_CYTHONIZED, SAGE_LIB, ["ntlwrap.cpp"])
++    ".", SAGE_CYTHONIZED, SAGE_USER_LIB, ["ntlwrap.cpp"])
+ print("Discovered Python/Cython sources, time: %.2f seconds." % (time.time() - t))
+ 
+ 

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