Rebase patches

4 files changed, 12 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 240a71ceb6be..fd357da9097e 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.4.beta5.r0.gf5efe4883f
+	pkgver = 9.5.beta0.r0.ga3bd57282c
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = x86_64
@@ -103,10 +103,10 @@ pkgbase = sagemath-git
 	source = sagemath-lrcalc2.patch
 	source = sagemath-lcalc2.patch
 	sha256sums = SKIP
-	sha256sums = c100a61c8dfade43bebc622a363abcb3d935a2f40958371ad87a9eb00689f8b0
+	sha256sums = b2308f25c5e6ad330342fc365056d7aebfbba09b833e3be6fb6283061709b6a0
 	sha256sums = 88e944f23c3b2391dc2e9f9be8e1131152d837dc8c829dfc714663869a272e81
 	sha256sums = af984186f852d2847d770a18fb6822296c50a652dbf55a1ed59d27517c3d3ee4
 	sha256sums = 240ac4c29d96d56407a20e1b7f9846e342a7eb2bb4edd6e5c86b3b5a8ff462f9
-	sha256sums = 0e019b77c0db815fdef04f66178a5fa74575fc98f485ad7ac1597c795b8a024e
+	sha256sums = 791b3f2c6e5529b09c3abf2f9703b6cf754d633a7a4177645b70b72ea014135a
 
 pkgname = sagemath-git
diff --git a/PKGBUILD b/PKGBUILD
index 6e22b2814917..c15cdcaa7513 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
 
 pkgname=sagemath-git
-pkgver=9.4.beta5.r0.gf5efe4883f
+pkgver=9.5.beta0.r0.ga3bd57282c
 pkgrel=1
 pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
 arch=(x86_64)
@@ -44,11 +44,11 @@ source=(git://git.sagemath.org/sage.git#branch=develop
         sagemath-lrcalc2.patch
         sagemath-lcalc2.patch)
 sha256sums=('SKIP'
-            'c100a61c8dfade43bebc622a363abcb3d935a2f40958371ad87a9eb00689f8b0'
+            'b2308f25c5e6ad330342fc365056d7aebfbba09b833e3be6fb6283061709b6a0'
             '88e944f23c3b2391dc2e9f9be8e1131152d837dc8c829dfc714663869a272e81'
             'af984186f852d2847d770a18fb6822296c50a652dbf55a1ed59d27517c3d3ee4'
             '240ac4c29d96d56407a20e1b7f9846e342a7eb2bb4edd6e5c86b3b5a8ff462f9'
-            '0e019b77c0db815fdef04f66178a5fa74575fc98f485ad7ac1597c795b8a024e')
+            '791b3f2c6e5529b09c3abf2f9703b6cf754d633a7a4177645b70b72ea014135a')
 
 pkgver() {
   cd sage
diff --git a/sagemath-lcalc2.patch b/sagemath-lcalc2.patch
index 77e58512909e..efc1ab9a8a7b 100644
--- a/sagemath-lcalc2.patch
+++ b/sagemath-lcalc2.patch
@@ -466,7 +466,7 @@ diff --git a/src/sage/schemes/elliptic_curves/ell_rational_field.py b/src/sage/s
 index bda999e..1736ce4 100644
 --- a/src/sage/schemes/elliptic_curves/ell_rational_field.py
 +++ b/src/sage/schemes/elliptic_curves/ell_rational_field.py
-@@ -1529,7 +1529,7 @@ class EllipticCurve_rational_field(EllipticCurve_number_field):
+@@ -1516,7 +1516,7 @@ class EllipticCurve_rational_field(EllipticCurve_number_field):
              sage: EllipticCurve([1234567,89101112]).analytic_rank(algorithm='rubinstein')
              Traceback (most recent call last):
              ...
diff --git a/sagemath-optional-packages.patch b/sagemath-optional-packages.patch
index f59d7823b3d2..4130e8850da6 100644
--- a/sagemath-optional-packages.patch
+++ b/sagemath-optional-packages.patch
@@ -1,14 +1,14 @@
-diff --git a/build/pkgs/sagelib/src/setup.py b/build/pkgs/sagelib/src/setup.py
+diff --git a/pkgs/sagemath-standard/setup.py b/pkgs/sagemath-standard/setup.py
 index 0d7c29d746..fb34cbfd5e 100755
---- a/build/pkgs/sagelib/src/setup.py
-+++ b/build/pkgs/sagelib/src/setup.py
-@@ -69,10 +69,9 @@ if sdist:
+--- a/pkgs/sagemath-standard/setup.py
++++ b/pkgs/sagemath-standard/setup.py
+@@ -75,10 +75,9 @@ if sdist:
  else:
      distributions = ['']
      optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib', 'primecount',
 -                                         'coxeter3', 'fes', 'sirocco', 'meataxe']
 +                                         'coxeter3', 'sirocco', 'meataxe']
-     distributions += ['sage-{}'.format(pkg)
+     distributions += ['sagemath-{}'.format(pkg)
 -                      for pkg in optional_packages_with_extensions
 -                      if is_package_installed_and_updated(pkg)]
 +                      for pkg in optional_packages_with_extensions]