[flint] 05/08: 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 5aff829480d704b57bc52d4d388356920b795a67
Merge: 8020b3c 16700d9
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Thu Mar 31 23:37:21 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Fixed-latex-manual-compilation.patch      | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 fmpz_poly/doc/fmpz_poly.txt                        |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index be06106,0000000..be4b94f
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
- 02ca7bf2912a1e1b0335e212f43ca8339b51b4fe
- 02ca7bf2912a1e1b0335e212f43ca8339b51b4fe
++16700d91bc15d90fa2b82f5c7c2cac0608d48b3c
++16700d91bc15d90fa2b82f5c7c2cac0608d48b3c
 +02ca7bf2912a1e1b0335e212f43ca8339b51b4fe
 +02ca7bf2912a1e1b0335e212f43ca8339b51b4fe
 +flint_2.5.2.orig.tar.gz
 +67c747ec92dda0dbc57ab88e2c501b11537299a5
 +2212242
diff --cc debian/patches/0001-Fixed-latex-manual-compilation.patch
index 0000000,0000000..bc02b4d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fixed-latex-manual-compilation.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 16700d91bc15d90fa2b82f5c7c2cac0608d48b3c Mon Sep 17 00:00:00 2001
++From: Julien Puydt <julien.puydt at laposte.net>
++Date: Thu, 31 Mar 2016 23:37:14 +0200
++Subject: Fixed latex manual compilation
++
++---
++ fmpz_poly/doc/fmpz_poly.txt | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/fmpz_poly/doc/fmpz_poly.txt b/fmpz_poly/doc/fmpz_poly.txt
++index 4d273dd..4f12e20 100644
++--- a/fmpz_poly/doc/fmpz_poly.txt
+++++ b/fmpz_poly/doc/fmpz_poly.txt
++@@ -2985,7 +2985,7 @@ void fmpz_poly_bound_roots(fmpz_t bound, const fmpz_poly_t poly)
++     $$
++     2 \max \left(
++         \left|\frac{a_{n-1}}{a_n}\right|,
++-        \left|\frac{a_{n-2}}{a_n}\right|^{\frac{1}{2}}, \dots
+++        \left|\frac{a_{n-2}}{a_n}\right|^{\frac{1}{2}}, \dotsc
++         \left|\frac{a_1}{a_n}\right|^{\frac{1}{n-1}},
++         \left|\frac{a_0}{2a_n}\right|^{\frac{1}{n}}
++     \right)
diff --cc debian/patches/series
index 0000000,0000000..19ab13a
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fixed-latex-manual-compilation.patch

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