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

commit 68d8027ecda35dcfa4bab81a165cf571875d78fb
Merge: dcd0c22 90f71d0
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Aug 27 00:01:40 2014 +0200

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 debian/changelog                                    |  6 ++++++
 ...ude-directly-g_lip.h-which-is-considered-i.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 interfaces/NTL-interface.cpp                        |  1 -
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 517bdf9,0000000..245218a
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
- 7266a720ae80afd0aeefb35eaa7ba31f1ab8a45e
- 7266a720ae80afd0aeefb35eaa7ba31f1ab8a45e
++90f71d0b9f32d02247c01c0080f5857a447d2f17
++90f71d0b9f32d02247c01c0080f5857a447d2f17
 +f14355e9070e235a68b933b3da8c238468e9a0e2
 +f14355e9070e235a68b933b3da8c238468e9a0e2
 +flint_2.4.4.orig.tar.gz
 +71075ce6d851af6244110644479bf29b4403212c
 +1639262
diff --cc debian/changelog
index d31cc92,0000000..67af23e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,56 -1,0 +1,62 @@@
++flint (2.4.4-2) UNRELEASED; urgency=low
++
++  * Added a patch to support NTL >= 6.2 (forwarded upstream).
++
++ -- Julien Puydt <julien.puydt at laposte.net>  Tue, 26 Aug 2014 23:58:19 +0200
++
 +flint (2.4.4-1) unstable; urgency=medium
 +
 +  [ Felix Salfelder ]
 +  * New upstream release (Closes: #592349, #743009, #558855).
 +  * Redo packaging, migrating from cdbs to dh.
 +
 +  [ Julien Puydt ]
 +  * Consensual package takeover from Tim Abbott into the Debian Science Team.
 +  * Rewrote d/copyright.
 +  * Don't use the patches of the two NMUs (they don't apply to current code).
 +  * Added a patch to handle both GMP < 6 and >= 6.
 +
 + -- Julien Puydt <julien.puydt at laposte.net>  Tue, 12 Aug 2014 22:23:22 +0200
 +
 +flint (1.011-2.2) unstable; urgency=low
 +
 +  * NMU: apply patch for build problem on mips (Closes: #665719)
 +         (patch from Dejan Latinovic)
 +
 + -- Thorsten Alteholz <debian at alteholz.de>  Mon, 11 Nov 2013 18:43:41 +0100
 +
 +flint (1.011-2.1) unstable; urgency=low
 +
 +  * NMU: Fix the inline ASM for ARM to specify .arm mode, so it works
 +    correctly when compiling with -mthumb-interwork (Closes: #652205)
 +
 + -- Adam Conrad <adconrad at debian.org>  Mon, 25 Jun 2012 18:43:41 -0600
 +
 +flint (1.011-2) unstable; urgency=low
 +
 +  * Add a prototype for __gmpn_udiv_w_sdiv when it is needed
 +  (Closes: #499877).
 +
 + -- Tim Abbott <tabbott at mit.edu>  Tue, 23 Sep 2008 21:13:54 -0400
 +
 +flint (1.011-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Update Standards-Version to 3.8.0.
 +  * Enable the new NTL interface.
 +
 + -- Tim Abbott <tabbott at mit.edu>  Thu, 10 Jul 2008 15:02:31 -0400
 +
 +flint (1.06-2) unstable; urgency=low
 +
 +  * Improve copyright file to mention other contributors.
 +  * Set priority to optional.
 +  * Improve description.
 +
 + -- Tim Abbott <tabbott at mit.edu>  Tue, 17 Jun 2008 16:14:49 -0400
 +
 +flint (1.06-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #480087).
 +
 + -- Tim Abbott <tabbott at mit.edu>  Fri, 30 May 2008 00:34:12 -0400
diff --cc debian/patches/0002-Don-t-include-directly-g_lip.h-which-is-considered-i.patch
index 0000000,0000000..49bfc52
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Don-t-include-directly-g_lip.h-which-is-considered-i.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 90f71d0b9f32d02247c01c0080f5857a447d2f17 Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Tue, 26 Aug 2014 23:23:11 +0200
++Subject: Don't include directly g_lip.h which is considered internal
++
++---
++ interfaces/NTL-interface.cpp | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/interfaces/NTL-interface.cpp b/interfaces/NTL-interface.cpp
++index c95ca3c..7dd1bcb 100644
++--- a/interfaces/NTL-interface.cpp
+++++ b/interfaces/NTL-interface.cpp
++@@ -34,7 +34,6 @@
++ #include <NTL/mat_ZZ.h>
++ #include <NTL/lip.h>
++ #include <NTL/ctools.h>
++-#include <NTL/g_lip.h>
++ #include <gmp.h>
++ 
++ #include "flint.h"
diff --cc debian/patches/series
index b0eb254,0000000..7491863
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Make-fmpz_invmod-behave-like-mpz_invert.patch
++0002-Don-t-include-directly-g_lip.h-which-is-considered-i.patch

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