[flint] 02/02: merge patched into master

[felix salfelder]

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

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

commit d5afe5e0690a87c340d049161759bb110a2869e5
Merge: 1787df3 fe5ae76
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sat May 24 13:59:45 2014 +0200

    merge patched into master

 debian/.git-dpm                                    |   4 +-
 ...-Disable-a-test-that-fails-with-GMP-6.0.0.patch |  26 +++
 ...-Remove-a-test-file-which-fails-with-GMP-.patch | 238 ---------------------
 debian/patches/series                              |   2 +-
 fmpz/test/t-invmod.c                               | 221 +++++++++++++++++++
 5 files changed, 250 insertions(+), 241 deletions(-)

diff --cc debian/.git-dpm
index 311ac01,0000000..7249110
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
- 8e2be49323e9785795660a6ebbaa23cbcda011b0
- 8e2be49323e9785795660a6ebbaa23cbcda011b0
++fe5ae76c8fa25c95d64dd118db432a782f55a355
++fe5ae76c8fa25c95d64dd118db432a782f55a355
 +d015fb41fcf1477f3790935cecd2af995f9cc4ac
 +d015fb41fcf1477f3790935cecd2af995f9cc4ac
 +flint_2.4.3.orig.tar.gz
 +1baa7157d64a881e1612620e190d780b55e5ee3b
 +1636527
diff --cc debian/patches/0001-Description-Disable-a-test-that-fails-with-GMP-6.0.0.patch
index 0000000,0000000..6c81258
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Description-Disable-a-test-that-fails-with-GMP-6.0.0.patch
@@@ -1,0 -1,0 +1,26 @@@
++From fe5ae76c8fa25c95d64dd118db432a782f55a355 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:=20Disable=20a=20test=20that=20fails=20with?=
++ =?UTF-8?q?=20GMP=20>=3D=206.0.0=20(making=20it=20possible=20to=20build=20?=
++ =?UTF-8?q?with=20it)=0AForwarded:=20not-needed?=
++
++---
++ fmpz/test/t-invmod.c | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/fmpz/test/t-invmod.c b/fmpz/test/t-invmod.c
++index aea236e..a0040e4 100644
++--- a/fmpz/test/t-invmod.c
+++++ b/fmpz/test/t-invmod.c
++@@ -36,8 +36,9 @@ main(void)
++     int i, result;
++     FLINT_TEST_INIT(state);
++ 
++-    flint_printf("invmod....");
+++    flint_printf("invmod.... (disabled)");
++     fflush(stdout);
+++    return 0;
++ 
++     
++ 
diff --cc debian/patches/series
index 5489a64,0000000..78b7e3a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 0001-Description-Remove-a-test-file-which-fails-with-GMP-.patch
++0001-Description-Disable-a-test-that-fails-with-GMP-6.0.0.patch

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