[flint] 03/03: merge patched into master

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository flint.

commit 5521d3ecc71eb832e91c427d0c31468cd69a88ca
Merge: e28f735 7266a72
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Mon Aug 11 10:35:43 2014 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...-Disable-a-test-that-fails-with-GMP-6.0.0.patch | 26 ---------------
 ...1-Make-fmpz_invmod-behave-like-mpz_invert.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 fmpz/invmod.c                                      |  4 +++
 fmpz/test/t-invmod.c                               |  3 +-
 6 files changed, 45 insertions(+), 31 deletions(-)

diff --cc debian/.git-dpm
index 6710bf6,0000000..517bdf9
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- a8280e6099abd71422ab7c3278f455b1901cccf8
- a8280e6099abd71422ab7c3278f455b1901cccf8
++7266a720ae80afd0aeefb35eaa7ba31f1ab8a45e
++7266a720ae80afd0aeefb35eaa7ba31f1ab8a45e
 +f14355e9070e235a68b933b3da8c238468e9a0e2
 +f14355e9070e235a68b933b3da8c238468e9a0e2
 +flint_2.4.4.orig.tar.gz
 +71075ce6d851af6244110644479bf29b4403212c
 +1639262
diff --cc debian/patches/0001-Make-fmpz_invmod-behave-like-mpz_invert.patch
index 0000000,0000000..5187cd8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Make-fmpz_invmod-behave-like-mpz_invert.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 7266a720ae80afd0aeefb35eaa7ba31f1ab8a45e Mon Sep 17 00:00:00 2001
++From: Jannis Harder <jix at jixco.de>
++Date: Tue, 24 Jun 2014 21:19:13 +0200
++Subject: Make fmpz_invmod behave like mpz_invert
++
++The fmpz_invmod behaviour now mirrors the GMP version used.
++This fixes the tests when compling against GMP 6.
++---
++ fmpz/invmod.c | 4 ++++
++ 1 file changed, 4 insertions(+)
++
++diff --git a/fmpz/invmod.c b/fmpz/invmod.c
++index a0cf601..0c692d4 100644
++--- a/fmpz/invmod.c
+++++ b/fmpz/invmod.c
++@@ -66,8 +66,10 @@ fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
++             ulong inv, gcd;
++             if (c2 < WORD(0))
++                 c2 = -c2;
+++#if __GNU_MP_VERSION < 6
++             if (c2 == WORD(1))
++                 return 0;       /* special case not handled by n_invmod */
+++#endif
++             gcd = z_gcdinv(&inv, c1, c2);
++ 
++             return (gcd == UWORD(1) ? fmpz_set_si(f, inv), 1 : 0);
++@@ -105,8 +107,10 @@ fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
++             ulong gcd, inv, r;
++             if (c2 < WORD(0))
++                 c2 = -c2;
+++#if __GNU_MP_VERSION < 6
++             if (c2 == WORD(1))
++                 return 0;       /* special case not handled by z_gcd_invert */
+++#endif
++             /* reduce g mod h first */
++ 
++             r = flint_mpz_fdiv_ui(COEFF_TO_PTR(c1), c2);
diff --cc debian/patches/series
index 78b7e3a,0000000..b0eb254
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 0001-Description-Disable-a-test-that-fails-with-GMP-6.0.0.patch
++0001-Make-fmpz_invmod-behave-like-mpz_invert.patch

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