[sagemath] 01/02: Apply patch from sage trac #21765 to improve the situation with pari 2.9.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository sagemath.

commit 7f7558350867bfab2d6bd2dce25a216acc08543c
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Wed Nov 2 19:15:57 2016 +0000

    Apply patch from sage trac #21765 to improve the situation with pari 2.9.
---
 debian/patches/series                            |  1 +
 debian/patches/version-pari-2.9-trac-21765.patch | 31 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index ac57112..f2f35ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +20,7 @@ version-ecm-7.patch
 version-singular-4.patch
 version-cddlib-094h.patch
 version-glpk-4.60.patch
+version-pari-2.9-trac-21765.patch
 #version-planarity-3.patch #breaks tests
 
 # due to Debian's inherent differences with upstream;
diff --git a/debian/patches/version-pari-2.9-trac-21765.patch b/debian/patches/version-pari-2.9-trac-21765.patch
new file mode 100644
index 0000000..7565e4a
--- /dev/null
+++ b/debian/patches/version-pari-2.9-trac-21765.patch
@@ -0,0 +1,31 @@
+From b39b10e6fde8491e6b1213ba9e84699aeef24b66 Mon Sep 17 00:00:00 2001
+From: Jeroen Demeyer <jdemeyer at cage.ugent.be>
+Date: Tue, 25 Oct 2016 14:19:41 +0200
+Subject: Simplify relative_discriminant()
+
+---
+ src/sage/rings/number_field/number_field_rel.py | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/sage/rings/number_field/number_field_rel.py b/src/sage/rings/number_field/number_field_rel.py
+index ca2b20e..cb9f346 100644
+--- a/sage/src/sage/rings/number_field/number_field_rel.py
++++ b/sage/src/sage/rings/number_field/number_field_rel.py
+@@ -2282,12 +2282,10 @@ class NumberField_relative(NumberField_generic):
+             sage: L.relative_discriminant()
+             Fractional ideal (2)
+         """
+-        nf = self._pari_base_nf()
+         base = self.base_field()
+-        abs_base, _, to_base = self.absolute_base_field()
++        nf = base.pari_nf()
+         D, d = nf.rnfdisc(self.pari_relative_polynomial())
+-        D = [to_base(abs_base(x, check=False)) for x in abs_base.pari_zk() * D]
+-        return base.ideal(D)
++        return base.ideal(nf.idealhnf(D))
+ 
+     def discriminant(self):
+         """
+-- 
+cgit v1.0-1-gd88e
+

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