[singular] 02/03: Remove NTL 6 compatibility patch.

[Tobias Hansen]

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

thansen pushed a commit to branch master3-sage
in repository singular.

commit 54a37a52aa9a9278cc61d08cfdd715ef5f1b9712
Author: Tobias Hansen <thansen at debian.org>
Date:   Wed Jul 6 17:54:24 2016 +0000

    Remove NTL 6 compatibility patch.
---
 debian/changelog                                   |  1 +
 ...18-NTL6-compatibility-patch-from-sagemath.patch | 52 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55565ba..3815e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 singular (3-1-6+dfsg-1+sage2) unstable-sage; urgency=medium
 
   * Rebuild for transition to libntl27.
+  * 0018-NTL6-compatibility-patch-from-sagemath.patch.
 
  -- Tobias Hansen <thansen at debian.org>  Wed, 06 Jul 2016 18:43:57 +0100
 
diff --git a/debian/patches/0018-NTL6-compatibility-patch-from-sagemath.patch b/debian/patches/0018-NTL6-compatibility-patch-from-sagemath.patch
deleted file mode 100644
index ae7ce3c..0000000
--- a/debian/patches/0018-NTL6-compatibility-patch-from-sagemath.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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 --git a/debian/patches/series b/debian/patches/series
index c8c997b..01d53fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,4 @@
 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
 fix-for-new-perl.patch

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