summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
-rw-r--r--latte-count.patch12
3 files changed, 9 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 210a77e01ebf..f878e8faf42d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = sagemath-git
pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab
- pkgver = 9.5.beta4.r0.g056b8d4e7b
+ pkgver = 9.5.beta5.r0.gf716a0b366
pkgrel = 1
url = http://www.sagemath.org
arch = x86_64
@@ -27,7 +27,6 @@ pkgbase = sagemath-git
depends = nauty
depends = python-rpy2
depends = python-fpylll
- depends = python-psutil
depends = python-cypari2
depends = python-matplotlib
depends = python-scipy
@@ -105,7 +104,7 @@ pkgbase = sagemath-git
source = sagemath-lcalc2.patch
sha256sums = SKIP
sha256sums = b2308f25c5e6ad330342fc365056d7aebfbba09b833e3be6fb6283061709b6a0
- sha256sums = 88e944f23c3b2391dc2e9f9be8e1131152d837dc8c829dfc714663869a272e81
+ sha256sums = 2f310081357996b7d3bf813e63d07c0fc04d6724adbfbd1beeb554e9476e2e4c
sha256sums = 079276c593d0f122b97144f80de8b1746a5735d0e82ebb194d471513771743a4
sha256sums = b7ebdba8612b1219011642c9bd4b377a23f402876a7d3dac90679a2bb34bbf98
sha256sums = 791b3f2c6e5529b09c3abf2f9703b6cf754d633a7a4177645b70b72ea014135a
diff --git a/PKGBUILD b/PKGBUILD
index 9099bf1fdb62..a4af1a7a6fa8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,13 +6,13 @@
# Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
pkgname=sagemath-git
-pkgver=9.5.beta4.r0.g056b8d4e7b
+pkgver=9.5.beta5.r0.gf716a0b366
pkgrel=1
pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
arch=(x86_64)
url='http://www.sagemath.org'
license=(GPL)
-depends=(palp brial cliquer maxima-ecl gfan sympow nauty python-rpy2 python-fpylll python-psutil python-cypari2
+depends=(palp brial cliquer maxima-ecl gfan sympow nauty python-rpy2 python-fpylll python-cypari2
python-matplotlib python-scipy python-sympy python-networkx python-pplpy python-sphinx python-ipywidgets python-memory-allocator
gap flintqs lcalc lrcalc arb eclib zn_poly gd python-cvxopt singular linbox m4rie pari-galdata pari-seadata-small planarity rankwidth tachyon
sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials
@@ -46,7 +46,7 @@ source=(git://git.sagemath.org/sage.git#branch=develop
sagemath-lcalc2.patch)
sha256sums=('SKIP'
'b2308f25c5e6ad330342fc365056d7aebfbba09b833e3be6fb6283061709b6a0'
- '88e944f23c3b2391dc2e9f9be8e1131152d837dc8c829dfc714663869a272e81'
+ '2f310081357996b7d3bf813e63d07c0fc04d6724adbfbd1beeb554e9476e2e4c'
'079276c593d0f122b97144f80de8b1746a5735d0e82ebb194d471513771743a4'
'b7ebdba8612b1219011642c9bd4b377a23f402876a7d3dac90679a2bb34bbf98'
'791b3f2c6e5529b09c3abf2f9703b6cf754d633a7a4177645b70b72ea014135a')
diff --git a/latte-count.patch b/latte-count.patch
index 86f6727178bc..7e3b4a93a545 100644
--- a/latte-count.patch
+++ b/latte-count.patch
@@ -73,14 +73,10 @@ diff --git a/src/sage/features/latte.py b/src/sage/features/latte.py
index 63d227fd35..040a5cf1f9 100644
--- a/src/sage/features/latte.py
+++ b/src/sage/features/latte.py
-@@ -9,10 +9,10 @@ from . import Executable, Feature, FeatureTestResult
-
- class Latte_count(Executable):
- r"""
-- Feature for the executable ``count`` from the LattE suite.
-+ Feature for the executable ``latte-count`` from the LattE suite.
- """
- def __init__(self):
+@@ -21,7 +21,7 @@ from . import Executable, Feature, FeatureTestResult
+ sage: isinstance(Latte_count(), Latte_count)
+ True
+ """
- Executable.__init__(self, "count", executable="count",
+ Executable.__init__(self, "latte-count", executable="latte-count",
spkg="latte_int",