[flint] 23/24: 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 b91e741f03b93dfe962e24e31fe762c74c954c14
Merge: adbb8a4 a8280e6
Author: Felix Salfelder <felix at salfelder.org>
Date:   Wed Jun 25 11:01:13 2014 +0200

    merge patched into master

 AUTHORS                                            |   4 +
 Makefile.in                                        |   2 +-
 code_conventions.txt                               |  21 ++++
 debian/.git-dpm                                    |   6 +-
 ...-Disable-a-test-that-fails-with-GMP-6.0.0.patch |   2 +-
 doc/latex/flint-manual.tex                         |   6 +-
 doc/latex/input/title.tex                          |   4 +-
 flint.h                                            |   4 +-
 ulong_extras/doc/ulong_extras.txt                  |  54 +++++++----
 ulong_extras/is_prime.c                            |  22 +++--
 ulong_extras/is_probabprime.c                      | 107 +++++++++++----------
 ulong_extras/is_strong_probabprime2_preinv.c       |   7 ++
 ulong_extras/is_strong_probabprime_precomp.c       |   9 +-
 ulong_extras/test/t-is_prime.c                     |  89 ++++++++++++++++-
 ulong_extras/test/t-is_probabprime.c               |  36 +++++++
 15 files changed, 283 insertions(+), 90 deletions(-)

diff --cc debian/.git-dpm
index d606065,0000000..6710bf6
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
- fe5ae76c8fa25c95d64dd118db432a782f55a355
- fe5ae76c8fa25c95d64dd118db432a782f55a355
- d015fb41fcf1477f3790935cecd2af995f9cc4ac
++a8280e6099abd71422ab7c3278f455b1901cccf8
++a8280e6099abd71422ab7c3278f455b1901cccf8
++f14355e9070e235a68b933b3da8c238468e9a0e2
 +f14355e9070e235a68b933b3da8c238468e9a0e2
 +flint_2.4.4.orig.tar.gz
 +71075ce6d851af6244110644479bf29b4403212c
 +1639262
diff --cc debian/patches/0001-Description-Disable-a-test-that-fails-with-GMP-6.0.0.patch
index 6c81258,0000000..8a51b17
mode 100644,000000..100644
--- a/debian/patches/0001-Description-Disable-a-test-that-fails-with-GMP-6.0.0.patch
+++ b/debian/patches/0001-Description-Disable-a-test-that-fails-with-GMP-6.0.0.patch
@@@ -1,26 -1,0 +1,26 @@@
- From fe5ae76c8fa25c95d64dd118db432a782f55a355 Mon Sep 17 00:00:00 2001
++From a8280e6099abd71422ab7c3278f455b1901cccf8 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;
 + 
 +     
 + 

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