[singular] 02/03: 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 singular.

commit 24c0a5d1b6d82cd909909d3d01674b7d7143d826
Merge: a3cd7e1 97ec68c
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Fri Aug 15 09:16:28 2014 +0200

    merge patched into master

 Singular/claptmpl.cc                               | 35 +++++++++++++++
 debian/.git-dpm                                    |  4 +-
 ...18-NTL6-compatibility-patch-from-sagemath.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 90 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 187d0b2,0000000..3e83686
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
- fbb53c6000d119fba6816a9d81655f494eb2982f
- fbb53c6000d119fba6816a9d81655f494eb2982f
++97ec68c07998e9c3b38aa340ee47aa2b4f6a09fb
++97ec68c07998e9c3b38aa340ee47aa2b4f6a09fb
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +singular_3-1-6+dfsg.orig.tar.gz
 +a970d278087f954d6e3ff439027b1a4dd6e7eb22
 +20108290
diff --cc debian/patches/0018-NTL6-compatibility-patch-from-sagemath.patch
index 0000000,0000000..ae7ce3c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0018-NTL6-compatibility-patch-from-sagemath.patch
@@@ -1,0 -1,0 +1,52 @@@
++From 97ec68c07998e9c3b38aa340ee47aa2b4f6a09fb Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Fri, 15 Aug 2014 09:16:12 +0200
++Subject: NTL6 compatibility patch (from sagemath)
++
++---
++ Singular/claptmpl.cc | 35 +++++++++++++++++++++++++++++++++++
++ 1 file changed, 35 insertions(+)
++
++diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
++index 512b353..ec34e00 100644
++--- a/Singular/claptmpl.cc
+++++ b/Singular/claptmpl.cc
++@@ -123,3 +123,38 @@ template class std::list<PolyMinorValue>;
++ template class Cache<MinorKey, IntMinorValue>;
++ template class Cache<MinorKey, PolyMinorValue>;
++ 
+++#ifdef HAVE_NTL
+++#include<NTL/version.h>
+++#if NTL_MAJOR_VERSION == 6
+++
+++#include<NTL/tools.h>
+++#include<NTL/lzz_pE.h>
+++#include<NTL/lzz_pEX.h>
+++#include<NTL/lzz_pX.h>
+++#include<NTL/lzz_p.h>
+++#include<NTL/vector.h>
+++#include<NTL/pair.h>
+++#include<NTL/GF2X.h>
+++#include<NTL/GF2EX.h>
+++#include<NTL/ZZ.h>
+++#include<NTL/ZZX.h>
+++#include<NTL/ZZ_pX.h>
+++#ifdef NTL_CLIENT               // in <NTL/tools.h>: using of name space NTL
+++NTL_CLIENT
+++#endif
+++template class Vec<zz_p>;
+++template class Vec<zz_pE>;
+++template class Mat<zz_p>;
+++template class Mat<zz_pE>;
+++template class Mat<ZZ>;
+++template class Vec<Pair<zz_pX, long> >;
+++template class Vec<Pair<zz_pEX, long> >;
+++template class Vec<Pair<GF2EX, long> >;
+++template class Vec<Pair<ZZX, long> >;
+++template class Vec<Pair<ZZ_pX, long> >;
+++template class Vec<Pair<GF2X, long> >;
+++template void swap<zz_pE>(Vec<zz_pE>&, Vec<zz_pE>&);
+++template long operator==<zz_p>(Vec<zz_p> const&, Vec<zz_p> const&);
+++#endif
+++
+++#endif
diff --cc debian/patches/series
index 6cbb89e,0000000..d1dca91
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,17 -1,0 +1,18 @@@
 +0001-tag-gfan-using-examples.patch
 +0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
 +0003-add-working-all-target-to-Makefile.in.patch
 +0004-miscellaneous-Makefile.in-patches.patch
 +0005-assert-needs-to-be-defined-after-include-assert.h.patch
 +0006-keep-mod2.h-in-Singular.patch
 +0007-move-libreadline-to-main-binary.patch
 +0008-default-path-settings.patch
 +0009-disable-examples-for-divisors-and-gitfan.patch
 +0010-fix-warning-treated-as-error-in-pyobject.cc.patch
 +0011-also-install-sing_dbm.h.patch
 +0012-don-t-forget-LDFLAGS-in-module-compilation.patch
 +0013-fix-mmInit-weirdness.patch
 +0014-sanitize-cf_gmp.h-generation.patch
 +0015-use-bin-sed-not-sed-in-build-system.patch
 +0016-Use-full-path-for-a-few-coreutils.patch
 +0017-make-interactive-docbuild-work.patch
++0018-NTL6-compatibility-patch-from-sagemath.patch

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