[sagemath] 01/01: Minor tweaks and fixes

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagemath.

commit 8ee758cd6c177a54ca3f6adb4d772f9b21f35359
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Jul 7 15:03:00 2016 +0200

    Minor tweaks and fixes
    
    - bump eclib versions for ntl rebuild
    - rm whitespace changes from patches
    - fix cysignals patch
---
 debian/control                                |  4 ++--
 debian/patches/cysignals-multiarch-path.patch |  4 ++--
 debian/patches/mpfi-fix-api.patch             | 27 ---------------------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/debian/control b/debian/control
index d73fcf3..6c4c4e6 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  debhelper (>= 9),
  dpkg-dev (>= 1.15.7~),
  ecl (= 15.3.7+dfsg1-1+sage1),
- eclib-tools (>= 20160101-1+sage1),
+ eclib-tools (>= 20160206-1+sage1),
  f2c,
  fflas-ffpack,
  flintqs,
@@ -32,7 +32,7 @@ Build-Depends:
  libboost-dev (>= 1.55),
  libcdd-dev (>= 094h-1),
  libcliquer-dev,
- libec-dev (>= 20160101-1+sage1),
+ libec-dev (>= 20160206-1+sage1),
  libecm-dev,
  libflint-arb-dev,
  libflint-dev (>= 2.3),
diff --git a/debian/patches/cysignals-multiarch-path.patch b/debian/patches/cysignals-multiarch-path.patch
index e87d404..3e546d6 100644
--- a/debian/patches/cysignals-multiarch-path.patch
+++ b/debian/patches/cysignals-multiarch-path.patch
@@ -9,8 +9,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- /dev/null
 +++ b/sage/build/pkgs/cysignals/patches/multiarch-path.patch
 @@ -0,0 +1,10 @@
-+--- src/scripts/cysignals-CSI	2016-07-07 14:28:52.333831922 +0200
-++++ src/scripts/cysignals-CSI	2016-07-07 14:27:14.542616423 +0200
++--- src/src/scripts/cysignals-CSI	2016-07-07 14:28:52.333831922 +0200
+++++ src/src/scripts/cysignals-CSI	2016-07-07 14:27:14.542616423 +0200
 +@@ -84,6 +84,7 @@
 +     """
 +     # Preload the right Python library
diff --git a/debian/patches/mpfi-fix-api.patch b/debian/patches/mpfi-fix-api.patch
index e477b5f..c950713 100644
--- a/debian/patches/mpfi-fix-api.patch
+++ b/debian/patches/mpfi-fix-api.patch
@@ -48,30 +48,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                  mpfi_get_right(x.value, self.value)
              else:
                  mpfr_set_zero(x.value, 1)                   # interval contains 0
-@@ -3195,13 +3195,13 @@
-         r"""
-         The argument of this interval, if it is well-defined, in the
-         complex sense. Otherwise raises a ``ValueError``.
--        
-+
-         OUTPUT:
--        
-+
-         - an element of the parent of this interval (0 or pi)
--        
-+
-         EXAMPLES::
--        
-+
-             sage: RIF(1).argument()
-             0
-             sage: RIF(-1).argument()
-@@ -3229,7 +3229,7 @@
-             return k.pi()
-         else:
-             raise ValueError("Can't take the argument of interval strictly containing zero")
-- 
-+
-     def unique_floor(self):
-         """
-         Returns the unique floor of this interval, if it is well defined,

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