[sagemath] 02/09: Update unbreak.patch.
Tobias Hansen
thansen at moszumanska.debian.org
Thu Apr 7 09:38:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository sagemath.
commit 078db6e624cab2253a529aea6849c500caada09a
Author: Tobias Hansen <thansen at localhost.localdomain>
Date: Wed Apr 6 22:17:58 2016 +0100
Update unbreak.patch.
---
debian/patches/unbreak.patch | 156 ++++++++-----------------------------------
1 file changed, 26 insertions(+), 130 deletions(-)
diff --git a/debian/patches/unbreak.patch b/debian/patches/unbreak.patch
index c5395e4..25b2d32 100644
--- a/debian/patches/unbreak.patch
+++ b/debian/patches/unbreak.patch
@@ -1,17 +1,6 @@
---- a/sage/build/deps
-+++ b/sage/build/deps
-@@ -4,7 +4,7 @@
- ###############################################################################
-
- # Do not put an explicit path for sage-spkg here, it will be found in $PATH.
--SAGE_SPKG = sage-spkg -f
-+SAGE_SPKG = sage-spkg
- PIPE = $(SAGE_ROOT)/build/pipestatus
-
- # Tell make not to look for files with these names:
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -287,16 +287,16 @@
+@@ -351,16 +351,16 @@
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
# Check that we're not in a source tarball which hasn't been built yet (#13561).
@@ -51,16 +40,15 @@
export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
export SAGE_SRC="$SAGE_ROOT/src"
-@@ -420,8 +420,6 @@
- unset R_HOME
- unset R_PROFILE
-
+@@ -444,7 +444,6 @@
+ fi
+ fi
+ fi
-MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
--
+
############ architecture flags
- # Support flags to change the build architecture. Currently, this is
-@@ -593,9 +591,6 @@
+@@ -611,9 +610,6 @@
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
fi
@@ -70,31 +58,9 @@
# Handle parallel building/testing/...
# See Trac Ticket #12016
# First, figure out the right values for SAGE_NUM_THREADS (default
---- a/sage/src/c_lib/SConstruct
-+++ b/sage/src/c_lib/SConstruct
-@@ -126,8 +126,8 @@
- # The SCons convenience function Split is the only strange thing
- # to python programmers. It just makes a list by splitting on
- # whitespace without the syntax clutter of lists of strings.
--includes = ['$SAGE_LOCAL/include/', '$SAGE_LOCAL/include/python$PYV/',
-- '$SAGE_LOCAL/include/NTL/', 'include']
-+includes = ['/usr/include/', '/usr/include/python$PYV/',
-+ '/usr/include/NTL/', '/usr/include/Lfunction', 'include']
- cFiles = Split( "interrupt.c")
- cppFiles = Split( "ntl_wrap.cpp" )
- srcFiles = cFiles + cppFiles
-@@ -136,7 +136,7 @@
-
- lib = env.SharedLibrary( "csage", [ "src/" + x for x in srcFiles ],
- LIBS=['ntl', 'pari', 'gmp', 'python$PYV'],
-- LIBPATH=['$SAGE_LOCAL/lib','$SAGE_LOCAL/lib/python$PYV/config/'],
-+ LIBPATH=['/usr/lib','/usr/lib/python$PYV/config/'],
- CPPPATH=includes )
- env.Install("$SAGE_LOCAL/lib", lib)
- env.Install("$SAGE_LOCAL/include/csage", [ os.path.join('include',x) for x in incFiles ])
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
-@@ -4,7 +4,7 @@
+@@ -3,7 +3,7 @@
from distutils.extension import Extension
from sage.env import SAGE_LOCAL
@@ -102,16 +68,7 @@
+SAGE_INC = '/usr/include'
#########################################################
- ### BLAS setup
-@@ -739,7 +739,7 @@
- sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
- libraries = ['m', 'ntl', 'mpfr', 'gmp', 'gmpxx',
- 'Lfunction'],
-- include_dirs = [SAGE_INC + "/libLfunction"],
-+ include_dirs = [SAGE_INC + "/Lfunction"],
- extra_compile_args=["-O3", "-ffast-math"],
- language = 'c++'),
-
+ ### pkg-config setup
--- a/sage/src/sage/all.py
+++ b/sage/src/sage/all.py
@@ -15,27 +15,6 @@
@@ -151,7 +108,7 @@
+#lazy_import('sage.dev.sagedev_instance', 'dev')
--- a/sage/src/sage/doctest/control.py
+++ b/sage/src/sage/doctest/control.py
-@@ -168,6 +168,8 @@
+@@ -170,6 +170,8 @@
True
"""
base, ext = os.path.splitext(filename)
@@ -162,11 +119,13 @@
with open(filename) as F:
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
-@@ -89,7 +89,7 @@
+@@ -90,8 +90,8 @@
_add_variable_or_fallback('SAGE_ROOT', None)
_add_variable_or_fallback('SAGE_LOCAL', opj('$SAGE_ROOT', 'local'))
_add_variable_or_fallback('SAGE_ETC', opj('$SAGE_LOCAL', 'etc'))
+-_add_variable_or_fallback('SAGE_INC', opj('$SAGE_LOCAL', 'include'))
-_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share'))
++_add_variable_or_fallback('SAGE_INC', opj('/usr/include'))
+_add_variable_or_fallback('SAGE_SHARE', opj('/usr/share/sagemath'))
_add_variable_or_fallback('SAGE_SRC', opj('$SAGE_ROOT', 'src'))
@@ -184,7 +143,7 @@
sage: len(r), len(w), len(x), t
--- a/sage/src/sage/interfaces/gap.py
+++ b/sage/src/sage/interfaces/gap.py
-@@ -189,7 +189,7 @@
+@@ -192,7 +192,7 @@
WORKSPACE = os.path.join(GAP_DIR, 'workspace-%s'%abs(hash(SAGE_LOCAL)))
@@ -206,20 +165,7 @@
print 'The gap-4.5.5.spkg (or later) seems to be not installed!'
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -68,9 +68,9 @@
- return 'atlas'
-
- include_dirs = [os.path.join(SAGE_LOCAL,'include','csage'),
-- os.path.join(SAGE_LOCAL,'include'), \
-- os.path.join(SAGE_LOCAL,'include','python'+platform.python_version().rsplit('.', 1)[0]), \
-- os.path.join(SAGE_LOCAL,'lib','python','site-packages','numpy','core','include'), \
-+ '/usr/include', \
-+ os.path.join('/usr/include','python'+platform.python_version().rsplit('.', 1)[0]), \
-+ os.path.join('/usr/lib','python','site-packages','numpy','core','include'), \
- os.path.join(SAGE_SRC,'sage','ext'), \
- os.path.join(SAGE_SRC), \
- os.path.join(SAGE_SRC,'sage','gsl')]
-@@ -435,7 +435,7 @@
+@@ -409,7 +409,7 @@
file_list = []
for fname in additional_source_files:
fname = fname.replace("$SAGE_SRC", SAGE_SRC)
@@ -228,58 +174,9 @@
if fname.startswith(os.path.sep):
file_list.append("'"+fname+"'")
else:
---- a/sage/src/sage/plot/arrow.py
-+++ b/sage/src/sage/plot/arrow.py
-@@ -411,7 +411,7 @@
- return False
-
-
-- class ConditionalStroke(pe._Base):
-+ class ConditionalStroke(pe.AbstractPathEffect):
-
- def __init__(self, condition_func, pe_list):
- """
---- a/sage/src/sage/plot/colors.py
-+++ b/sage/src/sage/plot/colors.py
-@@ -19,7 +19,7 @@
-
- For a list of color maps in Sage, evaluate::
-
-- sage: sorted(colormaps)
-+ sage: sorted(colormaps) # output is random
- ['Accent', 'Accent_r', 'Blues', 'Blues_r', 'BrBG', 'BrBG_r', ...]
-
- These are imported from matplotlib's cm_ module.
-@@ -1347,7 +1347,7 @@
- object), given its name or a [mixed] list/tuple of RGB list/tuples
- and color names. For a list of map names, evaluate::
-
-- sage: sorted(colormaps)
-+ sage: sorted(colormaps) # output is random
- ['Accent', 'Accent_r', 'Blues', 'Blues_r', ...]
-
- See :func:`rgbcolor` for valid list/tuple element formats.
-@@ -1408,7 +1408,7 @@
- A dict-like collection of lazily-loaded matplotlib color maps.
- For a list of map names, evaluate::
-
-- sage: sorted(colormaps)
-+ sage: sorted(colormaps) # output is random
- ['Accent', 'Accent_r', 'Blues', 'Blues_r', ...]
- """
- def __init__(self):
-@@ -1656,7 +1656,7 @@
- sage: maps = Colormaps()
- sage: count = len(maps)
- sage: maps.popitem()
-- ('Spectral', <matplotlib.colors.LinearSegmentedColormap object at ...>)
-+ (u'Spectral', <matplotlib.colors.LinearSegmentedColormap object at ...>)
- sage: count - 1 == len(maps)
- True
- """
--- a/sage/src/sage/tests/cmdline.py
+++ b/sage/src/sage/tests/cmdline.py
-@@ -537,12 +537,6 @@
+@@ -550,12 +550,6 @@
sage: ret
0
@@ -305,16 +202,7 @@
for path in libgap.eval('GAP_ROOT_PATHS').sage():
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -38,6 +38,8 @@
- # search for dependencies and add to gcc -I<path>
- import numpy
- include_dirs = [SAGE_INC,
-+ os.path.join(SAGE_INC, 'factory'),
-+ os.path.join(SAGE_INC, 'singular'),
- SAGE_SRC,
- os.path.join(SAGE_SRC, 'c_lib', 'include'),
- os.path.join(SAGE_SRC, 'sage', 'ext'),
-@@ -139,9 +141,9 @@
+@@ -162,9 +162,9 @@
# (that are likely to change on an upgrade) here:
# [At least at the moment. Make sure the headers aren't copied with "-p",
# or explicitly touch them in the respective spkg's spkg-install.]
@@ -327,7 +215,7 @@
}
# In the loop below, don't append to any list, since many of these
-@@ -167,7 +169,7 @@
+@@ -184,7 +184,7 @@
m.extra_compile_args = m.extra_compile_args + extra_compile_args
m.extra_link_args = m.extra_link_args + extra_link_args
@@ -336,3 +224,11 @@
m.include_dirs = m.include_dirs + include_dirs
+--- a/sage/src/sage/libs/lcalc/lcalc_sage.h
++++ b/sage/src/sage/libs/lcalc/lcalc_sage.h
+@@ -1,4 +1,4 @@
+-#include "libLfunction/L.h"
++#include "Lfunction/L.h"
+
+ int *new_ints(int l)
+ {
--
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