[libntl] 11/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 78762295646c7c5732e679f4314e6ef9e5dc8df5
Merge: 6abc068 7ad89e8
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Jun 1 17:09:23 2016 +0200

    merge patched into master

 debian/.git-dpm                     |  4 ++--
 debian/patches/0002-Fix-typo.patch  | 22 ----------------------
 debian/patches/0002-Fix-typos.patch | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  2 +-
 src/ZZ_pX.c                         |  2 +-
 5 files changed, 40 insertions(+), 26 deletions(-)

diff --cc debian/.git-dpm
index be8eb10,0000000..70f4735
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
- 56811d94ead7ac613bf34958cce07dfb9e8b46fb
- 56811d94ead7ac613bf34958cce07dfb9e8b46fb
++7ad89e8a16453600851bf54ce76852f6067a6200
++7ad89e8a16453600851bf54ce76852f6067a6200
 +55c369b715ebaf38a7de1bdcd37041e97dde3bd6
 +55c369b715ebaf38a7de1bdcd37041e97dde3bd6
 +ntl_9.9.0.orig.tar.gz
 +908595a2bfe966e799aeb167f317dffa4ee55d66
 +954063
diff --cc debian/patches/0002-Fix-typos.patch
index 0000000,0000000..b2d3688
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-typos.patch
@@@ -1,0 -1,0 +1,36 @@@
++From 7ad89e8a16453600851bf54ce76852f6067a6200 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 typos
++
++---
++ src/FFT.c   | 2 +-
++ src/ZZ_pX.c | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++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 --git a/src/ZZ_pX.c b/src/ZZ_pX.c
++index 3e7c23c..4b09716 100644
++--- a/src/ZZ_pX.c
+++++ b/src/ZZ_pX.c
++@@ -3107,7 +3107,7 @@ void rem(ZZ_pX& x, const ZZ_pX& a, const ZZ_pXModulus& F)
++    long da = deg(a);
++    long n = F.n;
++ 
++-   if (n < 0) LogicError("rem: unitialized modulus");
+++   if (n < 0) LogicError("rem: uninitialized modulus");
++ 
++    if (da <= 2*n-2) {
++       rem21(x, a, F);
diff --cc debian/patches/series
index 8106186,0000000..3e902f8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
 +0001-gcc-4.5-mips.patch
- 0002-Fix-typo.patch
++0002-Fix-typos.patch

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