[flint] 01/04: Remove debian patches : next upstream doesn't need anything

[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 8c844586967694d6a81cf845a816da7cc1543804
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Aug 12 13:06:46 2015 +0200

    Remove debian patches : next upstream doesn't need anything
---
 ...1-Make-fmpz_invmod-behave-like-mpz_invert.patch | 37 ----------------------
 ...de-directly-g_lip.h-which-is-considered-i.patch | 21 ------------
 debian/patches/series                              |  2 --
 fmpz/invmod.c                                      |  4 ---
 interfaces/NTL-interface.cpp                       |  1 +
 5 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/debian/patches/0001-Make-fmpz_invmod-behave-like-mpz_invert.patch b/debian/patches/0001-Make-fmpz_invmod-behave-like-mpz_invert.patch
deleted file mode 100644
index 5187cd8..0000000
--- a/debian/patches/0001-Make-fmpz_invmod-behave-like-mpz_invert.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 --git a/debian/patches/0002-Don-t-include-directly-g_lip.h-which-is-considered-i.patch b/debian/patches/0002-Don-t-include-directly-g_lip.h-which-is-considered-i.patch
deleted file mode 100644
index 49bfc52..0000000
--- a/debian/patches/0002-Don-t-include-directly-g_lip.h-which-is-considered-i.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 90f71d0b9f32d02247c01c0080f5857a447d2f17 Mon Sep 17 00:00:00 2001
-From: Julien Puydt <julien.puydt at laposte.net>
-Date: Tue, 26 Aug 2014 23:23:11 +0200
-Subject: Don't include directly g_lip.h which is considered internal
-
----
- interfaces/NTL-interface.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/interfaces/NTL-interface.cpp b/interfaces/NTL-interface.cpp
-index c95ca3c..7dd1bcb 100644
---- a/interfaces/NTL-interface.cpp
-+++ b/interfaces/NTL-interface.cpp
-@@ -34,7 +34,6 @@
- #include <NTL/mat_ZZ.h>
- #include <NTL/lip.h>
- #include <NTL/ctools.h>
--#include <NTL/g_lip.h>
- #include <gmp.h>
- 
- #include "flint.h"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7491863..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Make-fmpz_invmod-behave-like-mpz_invert.patch
-0002-Don-t-include-directly-g_lip.h-which-is-considered-i.patch
diff --git a/fmpz/invmod.c b/fmpz/invmod.c
index 0c692d4..a0cf601 100644
--- a/fmpz/invmod.c
+++ b/fmpz/invmod.c
@@ -66,10 +66,8 @@ 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);
@@ -107,10 +105,8 @@ 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 --git a/interfaces/NTL-interface.cpp b/interfaces/NTL-interface.cpp
index 7dd1bcb..c95ca3c 100644
--- a/interfaces/NTL-interface.cpp
+++ b/interfaces/NTL-interface.cpp
@@ -34,6 +34,7 @@
 #include <NTL/mat_ZZ.h>
 #include <NTL/lip.h>
 #include <NTL/ctools.h>
+#include <NTL/g_lip.h>
 #include <gmp.h>
 
 #include "flint.h"

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