[libntl] 08/12: 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 libntl.

commit d51170e55ea0480e8e967710d50c851fd5c438d0
Merge: 50e7c49 56811d9
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Jun 1 17:01:21 2016 +0200

    merge patched into master

 debian/.git-dpm                    |  4 ++--
 debian/patches/0002-Fix-typo.patch | 22 ++++++++++++++++++++++
 debian/patches/series              |  1 +
 src/FFT.c                          |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index ae130e8,0000000..be8eb10
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
- 8bda5c157d05c8c2f355fa17cc06091b7d66c5eb
- 8bda5c157d05c8c2f355fa17cc06091b7d66c5eb
++56811d94ead7ac613bf34958cce07dfb9e8b46fb
++56811d94ead7ac613bf34958cce07dfb9e8b46fb
 +55c369b715ebaf38a7de1bdcd37041e97dde3bd6
 +55c369b715ebaf38a7de1bdcd37041e97dde3bd6
 +ntl_9.9.0.orig.tar.gz
 +908595a2bfe966e799aeb167f317dffa4ee55d66
 +954063
diff --cc debian/patches/0002-Fix-typo.patch
index 0000000,0000000..d5c9ad6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-typo.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 56811d94ead7ac613bf34958cce07dfb9e8b46fb Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Wed, 1 Jun 2016 17:01:14 +0200
++Subject: Fix typo
++
++---
++ src/FFT.c | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/src/FFT.c b/src/FFT.c
++index f49e4ff..7f9f91b 100644
++--- a/src/FFT.c
+++++ b/src/FFT.c
++@@ -479,7 +479,7 @@ SmartPtr<zz_pInfoT> Build_zz_pInfo(FFTPrimeInfo *info) { return 0; }
++ 
++ void UseFFTPrime(long index)
++ {
++-   if (index < 0) LogicError("invalud FFT prime index");
+++   if (index < 0) LogicError("invalid FFT prime index");
++    if (index >= NTL_MAX_FFTPRIMES) ResourceError("FFT prime index too large");
++ 
++    do {  // NOTE: thread safe lazy init
diff --cc debian/patches/series
index 56b92cb,0000000..8106186
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-gcc-4.5-mips.patch
++0002-Fix-typo.patch

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