[flint-arb] 01/01: New patch flint_incldues.patch to fix flint includes.

Tobias Hansen thansen at moszumanska.debian.org
Mon Aug 1 16:59:10 UTC 2016


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

thansen pushed a commit to branch master
in repository flint-arb.

commit 985f4cb0e15fe97e48cf45a25bbbfad2eaf33fa4
Author: Tobias Hansen <thansen at debian.org>
Date:   Mon Aug 1 17:58:55 2016 +0100

    New patch flint_incldues.patch to fix flint includes.
---
 debian/changelog                    |   7 +
 debian/patches/flint_includes.patch | 951 ++++++++++++++++++++++++++++++++++++
 debian/patches/series               |   1 +
 3 files changed, 959 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 63b1e3c..293295f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flint-arb (2.8.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * New patch flint_incldues.patch to fix flint includes.
+
+ -- Tobias Hansen <thansen at debian.org>  Mon, 01 Aug 2016 17:57:17 +0100
+
 flint-arb (2.8.1-1) unstable; urgency=medium
 
   * Initial release. (Closes: #797822)
diff --git a/debian/patches/flint_includes.patch b/debian/patches/flint_includes.patch
new file mode 100644
index 0000000..a2a6c9a
--- /dev/null
+++ b/debian/patches/flint_includes.patch
@@ -0,0 +1,951 @@
+Description: Fix FLINT include paths
+ See https://github.com/fredrik-johansson/arb/pull/55
+Origin: https://git.sagemath.org/sage.git/tree/build/pkgs/arb/patches/flint_includes.patch
+Applied-Upstream: https://github.com/fredrik-johansson/arb/commit/80640c87e207a7ce548e4656136afffc10bf4e8e
+
+--- a/acb/test/t-rising2_ui_bs.c
++++ b/acb/test/t-rising2_ui_bs.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "acb_poly.h"
+ 
+ int main()
+--- a/acb/test/t-rising2_ui.c
++++ b/acb/test/t-rising2_ui.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "acb_poly.h"
+ 
+ int main()
+--- a/acb/test/t-rising2_ui_rs.c
++++ b/acb/test/t-rising2_ui_rs.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "acb_poly.h"
+ 
+ int main()
+--- a/acb_hypgeom/airy.c
++++ b/acb_hypgeom/airy.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "acb_hypgeom.h"
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ 
+ #define LOG2 0.69314718055994530942
+ #define EXP1 2.7182818284590452354
+--- a/acb_mat/exp.c
++++ b/acb_mat/exp.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ #include "acb_mat.h"
+ 
+ slong _arb_mat_exp_choose_N(const mag_t norm, slong prec);
+--- a/acb_mat.h
++++ b/acb_mat.h
+@@ -34,8 +34,8 @@
+ 
+ #include "arb.h"
+ #include "acb.h"
+-#include "fmpz_mat.h"
+-#include "fmpq_mat.h"
++#include "flint/fmpz_mat.h"
++#include "flint/fmpq_mat.h"
+ #include "arb_mat.h"
+ #include "acb_poly.h"
+ 
+--- a/acb_modular/test/t-delta.c
++++ b/acb_modular/test/t-delta.c
+@@ -25,7 +25,7 @@
+ 
+ #include "acb_modular.h"
+ 
+-#include "profiler.h"
++#include "flint/profiler.h"
+ 
+ int main()
+ {
+--- a/acb_modular/test/t-epsilon_arg.c
++++ b/acb_modular/test/t-epsilon_arg.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "acb_modular.h"
+-#include "arith.h"
++#include "flint/arith.h"
+ 
+ static void
+ acb_modular_epsilon_arg_naive(fmpq_t arg, const psl2z_t g)
+--- a/acb_modular/test/t-hilbert_class_poly.c
++++ b/acb_modular/test/t-hilbert_class_poly.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "fmpz_poly.h"
++#include "flint/fmpz_poly.h"
+ #include "acb_modular.h"
+ 
+ /* reference values h_(-d)(2015) mod 31337 computed using sage */
+--- a/arb/bell_fmpz.c
++++ b/arb/bell_fmpz.c
+@@ -24,8 +24,8 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "arith.h"
+-#include "double_extras.h"
++#include "flint/arith.h"
++#include "flint/double_extras.h"
+ 
+ /* \sum_{k=0}^{a-1} \frac{k^n}{k!} */
+ /* b = a * \frac{(a-1)^n}{(a-1)!} */
+--- a/arb/digamma.c
++++ b/arb/digamma.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "arith.h"
++#include "flint/arith.h"
+ 
+ void arb_gamma_stirling_choose_param(int * reflect, slong * r, slong * n,
+     const arb_t x, int use_reflect, int digamma, slong prec);
+--- a/arb/rising_ui_rs.c
++++ b/arb/rising_ui_rs.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "arb.h"
+ 
+ void
+--- a/arb/sin_cos.c
++++ b/arb/sin_cos.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "mpn_extras.h"
++#include "flint/mpn_extras.h"
+ 
+ #define TMP_ALLOC_LIMBS(__n) TMP_ALLOC((__n) * sizeof(mp_limb_t))
+ 
+--- a/arb/sin_cos_pi_fmpq_algebraic.c
++++ b/arb/sin_cos_pi_fmpq_algebraic.c
+@@ -29,8 +29,8 @@
+ 
+ 
+ /* include minpoly code here until it appears in a flint release */
+-#include "fmpz_poly.h"
+-#include "ulong_extras.h"
++#include "flint/fmpz_poly.h"
++#include "flint/ulong_extras.h"
+ 
+ /* Use a lookup table for small n. We skip 53, 59 and 61, as the
+    coefficients do not fit in 16 bits. */
+--- a/arb/test/t-addmul_si.c
++++ b/arb/test/t-addmul_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-addmul_ui.c
++++ b/arb/test/t-addmul_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-add_si.c
++++ b/arb/test/t-add_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-add_ui.c
++++ b/arb/test/t-add_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-atan_taylor_rf.c
++++ b/arb/test/t-atan_taylor_rf.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "mpn_extras.h"
++#include "flint/mpn_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-div_si.c
++++ b/arb/test/t-div_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-div_ui.c
++++ b/arb/test/t-div_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-exp_taylor_rf.c
++++ b/arb/test/t-exp_taylor_rf.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "mpn_extras.h"
++#include "flint/mpn_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-mul_si.c
++++ b/arb/test/t-mul_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-mul_ui.c
++++ b/arb/test/t-mul_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-rising2_ui_bs.c
++++ b/arb/test/t-rising2_ui_bs.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "arb_poly.h"
+ 
+ int main()
+--- a/arb/test/t-rising2_ui.c
++++ b/arb/test/t-rising2_ui.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "arb_poly.h"
+ 
+ int main()
+--- a/arb/test/t-rising2_ui_rs.c
++++ b/arb/test/t-rising2_ui_rs.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "arb_poly.h"
+ 
+ int main()
+--- a/arb/test/t-sin_cos_taylor_rf.c
++++ b/arb/test/t-sin_cos_taylor_rf.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "mpn_extras.h"
++#include "flint/mpn_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-submul_si.c
++++ b/arb/test/t-submul_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-submul_ui.c
++++ b/arb/test/t-submul_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-sub_si.c
++++ b/arb/test/t-sub_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int main()
+ {
+--- a/arb/test/t-sub_ui.c
++++ b/arb/test/t-sub_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arb.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ int main()
+ {
+--- a/arb/zeta_ui.c
++++ b/arb/zeta_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include <math.h>
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "arb.h"
+ 
+ void
+--- a/arb_mat/exp.c
++++ b/arb_mat/exp.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ #include "arb_mat.h"
+ 
+ #define LOG2_OVER_E 0.25499459743395350926
+--- a/arb_mat.h
++++ b/arb_mat.h
+@@ -33,9 +33,9 @@
+ #endif
+ 
+ #include "arb.h"
+-#include "fmpz_mat.h"
+-#include "fmpq_mat.h"
+-#include "perm.h"
++#include "flint/fmpz_mat.h"
++#include "flint/fmpq_mat.h"
++#include "flint/perm.h"
+ #include "arb_poly.h"
+ 
+ #ifdef __cplusplus
+--- a/arb_poly.h
++++ b/arb_poly.h
+@@ -34,8 +34,8 @@
+ 
+ #include "arb.h"
+ #include "acb.h"
+-#include "fmpz_poly.h"
+-#include "fmpq_poly.h"
++#include "flint/fmpz_poly.h"
++#include "flint/fmpq_poly.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
+--- a/arf/div.c
++++ b/arf/div.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "mpn_extras.h"
++#include "flint/mpn_extras.h"
+ 
+ #if !defined(__MPIR_VERSION)
+ #define USE_GMP_DIV_Q 1
+--- a/arf/get_d.c
++++ b/arf/get_d.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ 
+ /* most double: (2^53-1) * 2^971 */
+ /* least normal: 2^-1022 */
+--- a/arf/set_d.c
++++ b/arf/set_d.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ 
+ void
+ arf_set_d(arf_t x, double v)
+--- a/arf/test/t-addmul_si.c
++++ b/arf/test/t-addmul_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int
+ arf_addmul_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)
+--- a/arf/test/t-add_si.c
++++ b/arf/test/t-add_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int
+ arf_add_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)
+--- a/arf/test/t-add_ui.c
++++ b/arf/test/t-add_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ int
+ arf_add_ui_naive(arf_t z, const arf_t x, ulong y, slong prec, arf_rnd_t rnd)
+--- a/arf/test/t-mul_si.c
++++ b/arf/test/t-mul_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int
+ arf_mul_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)
+--- a/arf/test/t-mul_ui.c
++++ b/arf/test/t-mul_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ int
+ arf_mul_ui_naive(arf_t z, const arf_t x, ulong y, slong prec, arf_rnd_t rnd)
+--- a/arf/test/t-submul_si.c
++++ b/arf/test/t-submul_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int
+ arf_submul_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)
+--- a/arf/test/t-sub_si.c
++++ b/arf/test/t-sub_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int
+ arf_sub_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)
+--- a/arf/test/t-sub_ui.c
++++ b/arf/test/t-sub_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "arf.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ int
+ arf_sub_ui_naive(arf_t z, const arf_t x, ulong y, slong prec, arf_rnd_t rnd)
+--- a/arf.h
++++ b/arf.h
+@@ -36,7 +36,7 @@
+ #endif
+ 
+ #include <math.h>
+-#include "flint.h"
++#include "flint/flint.h"
+ #include "fmpr.h"
+ #include "mag.h"
+ 
+--- a/bernoulli/test/t-fmpq_ui.c
++++ b/bernoulli/test/t-fmpq_ui.c
+@@ -25,8 +25,8 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include "fmpz_vec.h"
+-#include "arith.h"
++#include "flint/fmpz_vec.h"
++#include "flint/arith.h"
+ #include "bernoulli.h"
+ 
+ int main()
+--- a/bernoulli/test/t-rev.c
++++ b/bernoulli/test/t-rev.c
+@@ -26,9 +26,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "bernoulli.h"
+-#include "ulong_extras.h"
+-#include "nmod_poly.h"
+-#include "nmod_vec.h"
++#include "flint/ulong_extras.h"
++#include "flint/nmod_poly.h"
++#include "flint/nmod_vec.h"
+ 
+ int main()
+ {
+--- a/bernoulli.h
++++ b/bernoulli.h
+@@ -27,11 +27,11 @@
+ #define BERNOULLI_H
+ 
+ #include <math.h>
+-#include "flint.h"
+-#include "fmpz.h"
+-#include "fmpz_vec.h"
+-#include "fmpq.h"
+-#include "arith.h"
++#include "flint/flint.h"
++#include "flint/fmpz.h"
++#include "flint/fmpz_vec.h"
++#include "flint/fmpq.h"
++#include "flint/arith.h"
+ #include "fmprb.h"
+ #include "arb.h"
+ 
+--- a/configure
++++ b/configure
+@@ -262,10 +262,6 @@
+    exit 1
+ fi
+ 
+-if [ -d "${FLINT_INC_DIR}/flint" ]; then
+-   FLINT_INC_DIR="${FLINT_INC_DIR}/flint"
+-fi
+-
+ LIB_DIRS="${LIB_DIRS} ${FLINT_LIB_DIR}"
+ INC_DIRS="${INC_DIRS} ${FLINT_INC_DIR}"
+ LIBS="${LIBS} flint"
+--- a/examples/hilbert_matrix.c
++++ b/examples/hilbert_matrix.c
+@@ -1,7 +1,7 @@
+ /* This file is public domain. Author: Fredrik Johansson. */
+ 
+ #include "arb_mat.h"
+-#include "profiler.h"
++#include "flint/profiler.h"
+ 
+ int main(int argc, char *argv[])
+ {
+--- a/examples/integrals.c
++++ b/examples/integrals.c
+@@ -1,7 +1,7 @@
+ /* This file is public domain. Author: Fredrik Johansson. */
+ 
+ #include "acb_calc.h"
+-#include "profiler.h"
++#include "flint/profiler.h"
+ 
+ int
+ sinx(acb_ptr out, const acb_t inp, void * params, slong order, slong prec)
+--- a/examples/keiper_li.c
++++ b/examples/keiper_li.c
+@@ -4,7 +4,7 @@
+ #include "arb.h"
+ #include "acb.h"
+ #include "arb_poly.h"
+-#include "profiler.h"
++#include "flint/profiler.h"
+ 
+ void
+ keiper_li_series(arb_ptr z, slong len, slong prec)
+--- a/examples/pi.c
++++ b/examples/pi.c
+@@ -1,7 +1,7 @@
+ /* This file is public domain. Author: Fredrik Johansson. */
+ 
+ #include "arb.h"
+-#include "profiler.h"
++#include "flint/profiler.h"
+ 
+ int main(int argc, char *argv[])
+ {
+--- a/examples/poly_roots.c
++++ b/examples/poly_roots.c
+@@ -3,8 +3,8 @@
+ #include <string.h>
+ #include "acb.h"
+ #include "acb_poly.h"
+-#include "arith.h"
+-#include "profiler.h"
++#include "flint/arith.h"
++#include "flint/profiler.h"
+ 
+ int check_accuracy(acb_ptr vec, slong len, slong prec)
+ {
+--- a/examples/real_roots.c
++++ b/examples/real_roots.c
+@@ -3,7 +3,7 @@
+ #include <string.h>
+ #include "arb_calc.h"
+ #include "acb_hypgeom.h"
+-#include "profiler.h"
++#include "flint/profiler.h"
+ 
+ slong eval_count = 0;
+ 
+--- a/fmpr/test/t-mul_si.c
++++ b/fmpr/test/t-mul_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "fmpr.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ static slong
+ fmpr_mul_si_naive(fmpr_t z, const fmpr_t x, slong y, slong prec, fmpr_rnd_t rnd)
+--- a/fmpr/test/t-mul_ui.c
++++ b/fmpr/test/t-mul_ui.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "fmpr.h"
+-#include "ulong_extras.h"
++#include "flint/ulong_extras.h"
+ 
+ static slong
+ fmpr_mul_ui_naive(fmpr_t z, const fmpr_t x, ulong y, slong prec, fmpr_rnd_t rnd)
+--- a/fmprb.h
++++ b/fmprb.h
+@@ -27,7 +27,7 @@
+ #define FMPRB_H
+ 
+ #include "fmpr.h"
+-#include "fmpz_poly.h"
++#include "flint/fmpz_poly.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
+--- a/fmpr.h
++++ b/fmpr.h
+@@ -33,12 +33,12 @@
+ #include <limits.h>
+ #include <gmp.h>
+ #include <mpfr.h>
+-#include "flint.h"
+-#include "fmpz.h"
+-#include "fmpq.h"
++#include "flint/flint.h"
++#include "flint/fmpz.h"
++#include "flint/fmpq.h"
+ #include "fmpz_extras.h"
+ 
+-#include "config.h"
++#include "flint/config.h"
+ #ifdef HAVE_TLS
+ #if HAVE_TLS
+ #define TLS_PREFIX __thread
+--- a/fmpz_extras.h
++++ b/fmpz_extras.h
+@@ -27,8 +27,8 @@
+ #define FMPZ_EXTRAS_H
+ 
+ #include <limits.h>
+-#include "flint.h"
+-#include "fmpz.h"
++#include "flint/flint.h"
++#include "flint/fmpz.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
+--- a/hypgeom/bound.c
++++ b/hypgeom/bound.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include <math.h>
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ #include "hypgeom.h"
+ 
+ slong
+--- a/hypgeom/estimate_terms_d.c
++++ b/hypgeom/estimate_terms_d.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include <math.h>
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ #include "hypgeom.h"
+ 
+ #define LOG2 0.69314718055994530942
+--- a/hypgeom.h
++++ b/hypgeom.h
+@@ -29,7 +29,7 @@
+ #include "fmprb.h"
+ #include "arb.h"
+ #include "mag.h"
+-#include "fmpz_poly.h"
++#include "flint/fmpz_poly.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
+--- a/mag/d_log.c
++++ b/mag/d_log.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "mag.h"
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ 
+ /*
+ This is a bad implementation the logarithm function,
+--- a/mag/exp.c
++++ b/mag/exp.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "mag.h"
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ 
+ static const double inverse_factorials[] = {
+     1.0,
+--- a/mag/get_d.c
++++ b/mag/get_d.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ #include "mag.h"
+ 
+ double
+--- a/mag/log1p.c
++++ b/mag/log1p.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "mag.h"
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ 
+ void
+ mag_log1p(mag_t z, const mag_t x)
+--- a/mag/test/t-cmp_2exp_si.c
++++ b/mag/test/t-cmp_2exp_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "mag.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int main()
+ {
+--- a/mag/test/t-d_log_lower_bound.c
++++ b/mag/test/t-d_log_lower_bound.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ #include "mag.h"
+ 
+ /* XXX: d_randtest is not good enough */
+--- a/mag/test/t-d_log_upper_bound.c
++++ b/mag/test/t-d_log_upper_bound.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ #include "mag.h"
+ 
+ /* XXX: d_randtest is not good enough */
+--- a/mag/test/t-mul_2exp_si.c
++++ b/mag/test/t-mul_2exp_si.c
+@@ -24,7 +24,7 @@
+ ******************************************************************************/
+ 
+ #include "mag.h"
+-#include "long_extras.h"
++#include "flint/long_extras.h"
+ 
+ int main()
+ {
+--- a/mag/test/t-set_d_2exp_fmpz.c
++++ b/mag/test/t-set_d_2exp_fmpz.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ #include "mag.h"
+ 
+ /* XXX: d_randtest is not good enough */
+--- a/mag/test/t-set_d.c
++++ b/mag/test/t-set_d.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "double_extras.h"
++#include "flint/double_extras.h"
+ #include "mag.h"
+ 
+ /* XXX: d_randtest is not good enough */
+--- a/mag.h
++++ b/mag.h
+@@ -33,8 +33,8 @@
+ #endif
+ 
+ #include <math.h>
+-#include "flint.h"
+-#include "fmpz.h"
++#include "flint/flint.h"
++#include "flint/fmpz.h"
+ #include "fmpz_extras.h"
+ 
+ #ifdef __cplusplus
+--- a/partitions/hrr_sum_arb.c
++++ b/partitions/hrr_sum_arb.c
+@@ -25,7 +25,7 @@
+ 
+ #include "partitions.h"
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "arb.h"
+ #include "math.h"
+ 
+--- a/partitions/test/t-partitions_fmpz_ui.c
++++ b/partitions/test/t-partitions_fmpz_ui.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "partitions.h"
+ 
+ /* Values mod 10^9 generated with Sage */
+--- a/partitions/test/t-partitions_fmpz_ui_threaded.c
++++ b/partitions/test/t-partitions_fmpz_ui_threaded.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "partitions.h"
+ 
+ /* Values mod 10^9 */
+--- a/partitions/test/t-partitions_fmpz_ui_using_doubles.c
++++ b/partitions/test/t-partitions_fmpz_ui_using_doubles.c
+@@ -23,7 +23,7 @@
+ 
+ ******************************************************************************/
+ 
+-#include "arith.h"
++#include "flint/arith.h"
+ #include "partitions.h"
+ 
+ /* Values mod 10^9 generated with Sage */
+--- a/partitions.h
++++ b/partitions.h
+@@ -27,8 +27,8 @@
+ #define PARTITIONS_H
+ 
+ #include <math.h>
+-#include "flint.h"
+-#include "arith.h"
++#include "flint/flint.h"
++#include "flint/arith.h"
+ #include "arb.h"
+ 
+ #ifdef __cplusplus
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9a2cc11
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+flint_includes.patch

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



More information about the debian-science-commits mailing list