[sagemath] 01/01: Remove flint-arb workaround from README.Debian (fixed in unstable).

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit 4b2532425d7e6bf999e53ea742bf6e3978da5b12
Author: Tobias Hansen <thansen at debian.org>
Date:   Tue Aug 2 07:10:56 2016 +0000

    Remove flint-arb workaround from README.Debian (fixed in unstable).
---
 debian/README.Debian     |   6 +-
 debian/arb-headers.patch | 162 -----------------------------------------------
 2 files changed, 1 insertion(+), 167 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index aaccd8a..aa61143 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,11 +5,7 @@ for instructions on using this repository.
 
 ## TODO (required for the build to work)
 
-* Patch flint-arb:
-
-see https://github.com/fredrik-johansson/arb/pull/55
-see debian/arb-headers.patch for a local workaround; apply it with:
-$ sudo patch -d /usr/include/ -p1 < debian/arb-headers.patch
+* Currently there are no extra steps required to make the build work.
 
 Then the build (including documentation) should work, but some tests will fail.
 This is probably due to a combination of:
diff --git a/debian/arb-headers.patch b/debian/arb-headers.patch
deleted file mode 100644
index 934170e..0000000
--- a/debian/arb-headers.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -ru -ru arb-headers.orig/acb_mat.h arb-headers/acb_mat.h
---- arb-headers.orig/acb_mat.h	2016-07-07 15:36:05.889475578 +0200
-+++ arb-headers/acb_mat.h	2016-07-07 15:35:09.453928290 +0200
-@@ -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"
- 
-diff -ru -ru arb-headers.orig/arb_mat.h arb-headers/arb_mat.h
---- arb-headers.orig/arb_mat.h	2016-07-07 15:36:05.885475609 +0200
-+++ arb-headers/arb_mat.h	2016-07-07 15:35:09.449928323 +0200
-@@ -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
-diff -ru -ru arb-headers.orig/arb_poly.h arb-headers/arb_poly.h
---- arb-headers.orig/arb_poly.h	2016-07-07 15:36:05.881475642 +0200
-+++ arb-headers/arb_poly.h	2016-07-07 15:35:09.445928355 +0200
-@@ -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" {
-diff -ru -ru arb-headers.orig/arf.h arb-headers/arf.h
---- arb-headers.orig/arf.h	2016-07-07 15:36:05.861475802 +0200
-+++ arb-headers/arf.h	2016-07-07 15:35:09.425928516 +0200
-@@ -36,7 +36,7 @@
- #endif
- 
- #include <math.h>
--#include "flint.h"
-+#include "flint/flint.h"
- #include "fmpr.h"
- #include "mag.h"
- 
-diff -ru -ru arb-headers.orig/bernoulli.h arb-headers/bernoulli.h
---- arb-headers.orig/bernoulli.h	2016-07-07 15:36:05.889475578 +0200
-+++ arb-headers/bernoulli.h	2016-07-07 15:35:09.453928290 +0200
-@@ -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"
- 
-diff -ru -ru arb-headers.orig/fmprb.h arb-headers/fmprb.h
---- arb-headers.orig/fmprb.h	2016-07-07 15:36:05.861475802 +0200
-+++ arb-headers/fmprb.h	2016-07-07 15:35:09.425928516 +0200
-@@ -27,7 +27,7 @@
- #define FMPRB_H
- 
- #include "fmpr.h"
--#include "fmpz_poly.h"
-+#include "flint/fmpz_poly.h"
- 
- #ifdef __cplusplus
- extern "C" {
-diff -ru -ru arb-headers.orig/fmpr.h arb-headers/fmpr.h
---- arb-headers.orig/fmpr.h	2016-07-07 15:36:05.865475770 +0200
-+++ arb-headers/fmpr.h	2016-07-07 15:35:09.429928484 +0200
-@@ -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
-diff -ru -ru arb-headers.orig/fmpz_extras.h arb-headers/fmpz_extras.h
---- arb-headers.orig/fmpz_extras.h	2016-07-07 15:36:05.873475706 +0200
-+++ arb-headers/fmpz_extras.h	2016-07-07 15:35:09.441928387 +0200
-@@ -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" {
-diff -ru -ru arb-headers.orig/hypgeom.h arb-headers/hypgeom.h
---- arb-headers.orig/hypgeom.h	2016-07-07 15:36:05.873475706 +0200
-+++ arb-headers/hypgeom.h	2016-07-07 15:35:09.437928420 +0200
-@@ -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" {
-diff -ru -ru arb-headers.orig/mag.h arb-headers/mag.h
---- arb-headers.orig/mag.h	2016-07-07 15:36:05.893475546 +0200
-+++ arb-headers/mag.h	2016-07-07 15:35:09.457928259 +0200
-@@ -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
-diff -ru -ru arb-headers.orig/partitions.h arb-headers/partitions.h
---- arb-headers.orig/partitions.h	2016-07-07 15:36:05.893475546 +0200
-+++ arb-headers/partitions.h	2016-07-07 15:35:09.457928259 +0200
-@@ -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

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