[flint] 02/03: merge patched into master
felix salfelder
felix-guest at moszumanska.debian.org
Sat May 24 06:33:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
felix-guest pushed a commit to branch master
in repository flint.
commit d8c51b4d8efcf8598ba07e1f615bc41c161c558d
Merge: 5f43feb 8e2be49
Author: Felix Salfelder <felix at salfelder.org>
Date: Fri May 23 22:06:49 2014 +0200
merge patched into master
debian/.git-dpm | 4 +-
...Remove-a-test-file-which-fails-with-GMP-.patch} | 21 +-
debian/patches/flint-clean.patch | 10 -
debian/patches/flint-ntl-interface.patch | 30 ---
debian/patches/flint-s390.patch | 12 --
debian/patches/flint-soname.patch | 20 --
debian/patches/series | 7 +-
debian/patches/zn_poly_include.patch | 66 -------
fmpz/test/t-invmod.c | 220 ---------------------
9 files changed, 18 insertions(+), 372 deletions(-)
diff --cc debian/.git-dpm
index 7cfb9de,0000000..311ac01
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
- d015fb41fcf1477f3790935cecd2af995f9cc4ac
- d015fb41fcf1477f3790935cecd2af995f9cc4ac
++8e2be49323e9785795660a6ebbaa23cbcda011b0
++8e2be49323e9785795660a6ebbaa23cbcda011b0
+d015fb41fcf1477f3790935cecd2af995f9cc4ac
+d015fb41fcf1477f3790935cecd2af995f9cc4ac
+flint_2.4.3.orig.tar.gz
+1baa7157d64a881e1612620e190d780b55e5ee3b
+1636527
diff --cc debian/patches/0001-Description-Remove-a-test-file-which-fails-with-GMP-.patch
index 39dad98,0000000..55d70a8
mode 100644,000000..100644
--- a/debian/patches/0001-Description-Remove-a-test-file-which-fails-with-GMP-.patch
+++ b/debian/patches/0001-Description-Remove-a-test-file-which-fails-with-GMP-.patch
@@@ -1,229 -1,0 +1,238 @@@
- Description: Remove a test file which fails with GMP >= 6.0.0 (making it possible to build with it)
- Author: Julien Puydt <julien.puydt at laposte.net>
- Forwarded: not-needed
++From 8e2be49323e9785795660a6ebbaa23cbcda011b0 Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Fri, 23 May 2014 22:05:29 +0200
++Subject: =?UTF-8?q?Description:=20Remove=20a=20test=20file=20which=20fails?=
++ =?UTF-8?q?=20with=20GMP=20>=3D=206.0.0=20(making=20it=20possible=20to=20b?=
++ =?UTF-8?q?uild=20with=20it)=0AForwarded:=20not-needed?=
+
- Index: flint/fmpz/test/t-invmod.c
- ===================================================================
- --- flint.orig/fmpz/test/t-invmod.c
++---
++ fmpz/test/t-invmod.c | 220 ---------------------------------------------------
++ 1 file changed, 220 deletions(-)
++ delete mode 100644 fmpz/test/t-invmod.c
++
++diff --git a/fmpz/test/t-invmod.c b/fmpz/test/t-invmod.c
++deleted file mode 100644
++index aea236e..0000000
++--- a/fmpz/test/t-invmod.c
++++ /dev/null
+@@ -1,220 +0,0 @@
+-/*=============================================================================
+-
+- This file is part of FLINT.
+-
+- FLINT is free software; you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation; either version 2 of the License, or
+- (at your option) any later version.
+-
+- FLINT is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with FLINT; if not, write to the Free Software
+- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+-
+-=============================================================================*/
+-/******************************************************************************
+-
+- Copyright (C) 2009 William Hart
+-
+-******************************************************************************/
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <gmp.h>
+-#include "flint.h"
+-#include "ulong_extras.h"
+-#include "fmpz.h"
+-
+-int
+-main(void)
+-{
+- int i, result;
+- FLINT_TEST_INIT(state);
+-
+- flint_printf("invmod....");
+- fflush(stdout);
+-
+-
+-
+- for (i = 0; i < 10000 * flint_test_multiplier(); i++)
+- {
+- fmpz_t a, b, c;
+- mpz_t d, e, f, g;
+- int r1, r2;
+-
+- fmpz_init(a);
+- fmpz_init(b);
+- fmpz_init(c);
+-
+- mpz_init(d);
+- mpz_init(e);
+- mpz_init(f);
+- mpz_init(g);
+-
+- fmpz_randtest(a, state, 200);
+- fmpz_randtest_not_zero(b, state, 200);
+-
+- fmpz_get_mpz(d, a);
+- fmpz_get_mpz(e, b);
+-
+- r1 = fmpz_invmod(c, a, b);
+- r2 = mpz_invert(f, d, e);
+-
+- fmpz_get_mpz(g, c);
+-
+- result = (r1 != 0 && r2 != 0 && (mpz_cmp(f, g) == 0)) || (r1 == 0 && r2 == 0);
+- if (!result)
+- {
+- flint_printf("FAIL:\n");
+- gmp_printf
+- ("d = %Zd, e = %Zd, f = %Zd, g = %Zd, r1 = %d, r2 = %d\n", d,
+- e, f, g, r1, r2);
+- abort();
+- }
+-
+- fmpz_clear(a);
+- fmpz_clear(b);
+- fmpz_clear(c);
+-
+- mpz_clear(d);
+- mpz_clear(e);
+- mpz_clear(f);
+- mpz_clear(g);
+- }
+-
+- /* Check aliasing of a and b */
+- for (i = 0; i < 10000 * flint_test_multiplier(); i++)
+- {
+- fmpz_t a, c;
+- mpz_t d, f, g;
+- int r1, r2;
+-
+- fmpz_init(a);
+- fmpz_init(c);
+-
+- mpz_init(d);
+- mpz_init(f);
+- mpz_init(g);
+-
+- fmpz_randtest_not_zero(a, state, 200);
+-
+- fmpz_get_mpz(d, a);
+-
+- r1 = fmpz_invmod(c, a, a);
+- r2 = mpz_invert(f, d, d);
+-
+- fmpz_get_mpz(g, c);
+-
+- result = (r1 != 0 && r2 != 0 && (mpz_cmp(f, g) == 0)) || (r1 == 0 && r2 == 0);
+- if (!result)
+- {
+- flint_printf("FAIL:\n");
+- gmp_printf("d = %Zd, f = %Zd, g = %Zd, r1 = %d, r2 = %d\n", d, f,
+- g, r1, r2);
+- abort();
+- }
+-
+- fmpz_clear(a);
+- fmpz_clear(c);
+-
+- mpz_clear(d);
+- mpz_clear(f);
+- mpz_clear(g);
+- }
+-
+- /* Test aliasing of a and c */
+- for (i = 0; i < 10000 * flint_test_multiplier(); i++)
+- {
+- fmpz_t a, b;
+- mpz_t d, e, f, g;
+- int r1, r2;
+-
+- fmpz_init(a);
+- fmpz_init(b);
+-
+- mpz_init(d);
+- mpz_init(e);
+- mpz_init(f);
+- mpz_init(g);
+-
+- fmpz_randtest(a, state, 200);
+- fmpz_randtest_not_zero(b, state, 200);
+-
+- fmpz_get_mpz(d, a);
+- fmpz_get_mpz(e, b);
+-
+- r1 = fmpz_invmod(a, a, b);
+- r2 = mpz_invert(f, d, e);
+-
+- fmpz_get_mpz(g, a);
+-
+- result = (r1 != 0 && r2 != 0 && (mpz_cmp(f, g) == 0)) || (r1 == 0 && r2 == 0);
+- if (!result)
+- {
+- flint_printf("FAIL:\n");
+- gmp_printf("d = %Zd, e = %Zd, f = %Zd, g = %Zd\n", d, e, f, g);
+- abort();
+- }
+-
+- fmpz_clear(a);
+- fmpz_clear(b);
+-
+- mpz_clear(d);
+- mpz_clear(e);
+- mpz_clear(f);
+- mpz_clear(g);
+- }
+-
+- /* Test aliasing of b and c */
+- for (i = 0; i < 10000 * flint_test_multiplier(); i++)
+- {
+- fmpz_t a, b;
+- mpz_t d, e, f, g;
+- int r1, r2;
+-
+- fmpz_init(a);
+- fmpz_init(b);
+-
+- mpz_init(d);
+- mpz_init(e);
+- mpz_init(f);
+- mpz_init(g);
+-
+- fmpz_randtest(a, state, 200);
+- fmpz_randtest_not_zero(b, state, 200);
+-
+- fmpz_get_mpz(d, a);
+- fmpz_get_mpz(e, b);
+-
+- r1 = fmpz_invmod(b, a, b);
+- r2 = mpz_invert(f, d, e);
+-
+- fmpz_get_mpz(g, b);
+-
+- result = (r1 != 0 && r2 != 0 && (mpz_cmp(f, g) == 0)) || (r1 == 0 && r2 == 0);
+- if (!result)
+- {
+- flint_printf("FAIL:\n");
+- gmp_printf("d = %Zd, e = %Zd, f = %Zd, g = %Zd\n", d, e, f, g);
+- abort();
+- }
+-
+- fmpz_clear(a);
+- fmpz_clear(b);
+-
+- mpz_clear(d);
+- mpz_clear(e);
+- mpz_clear(f);
+- mpz_clear(g);
+- }
+-
+- FLINT_TEST_CLEANUP(state);
+-
+- flint_printf("PASS\n");
+- return 0;
+-}
diff --cc debian/patches/series
index 09f7c7c,0000000..5489a64
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,1 @@@
- gmp_6_0_0_compat.patch
- #flint-s390.patch
- #flint-soname.patch
- #flint-clean.patch
- #flint-ntl-interface.patch
- #zn_poly_include.patch
++0001-Description-Remove-a-test-file-which-fails-with-GMP-.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/flint.git
More information about the debian-science-commits
mailing list