[sagemath] 03/05: Refresh patches for 8.1.rc0.

Tobias Hansen thansen at moszumanska.debian.org
Sat Nov 11 08:02:35 UTC 2017 

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

thansen pushed a commit to branch master
in repository sagemath.

commit e063adfe71044302f7777bd1d4794f6b8ca31c8d
Author: Tobias Hansen <thansen at debian.org>
Date:   Sat Nov 11 01:44:27 2017 +0000

    Refresh patches for 8.1.rc0.
---
 debian/patches/d0-arb.patch                        | 2 +-
 debian/patches/d0-gsl-cblas.patch                  | 2 +-
 debian/patches/d0-libgap-sage.patch                | 2 +-
 debian/patches/d0-pari-2.9-revert-23544.patch      | 2 +-
 debian/patches/d0-paths.patch                      | 2 +-
 debian/patches/d0-singular.patch                   | 2 +-
 debian/patches/d1-disable-post-install-tests.patch | 4 ++--
 debian/patches/d1-install-paths.patch              | 2 +-
 debian/patches/d1-multiarch-python-paths.patch     | 2 +-
 debian/patches/d1-sage-env.patch                   | 2 +-
 debian/patches/d1-test-optional.patch              | 2 +-
 debian/patches/df-python_security.patch            | 2 +-
 debian/patches/u1-scripts-dir.patch                | 4 ++--
 debian/patches/u2-fix-trivial-test-cases.patch     | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/patches/d0-arb.patch b/debian/patches/d0-arb.patch
index 9b640e0..717d103 100644
--- a/debian/patches/d0-arb.patch
+++ b/debian/patches/d0-arb.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
      "brial",
      "brial_groebner",
      "m4rie",
-@@ -772,7 +772,7 @@
+@@ -750,7 +750,7 @@
  
      Extension("sage.matrix.matrix_complex_ball_dense",
                ["sage/matrix/matrix_complex_ball_dense.pyx"],
diff --git a/debian/patches/d0-gsl-cblas.patch b/debian/patches/d0-gsl-cblas.patch
index a099870..fe73623 100644
--- a/debian/patches/d0-gsl-cblas.patch
+++ b/debian/patches/d0-gsl-cblas.patch
@@ -28,7 +28,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  if os.path.exists('/usr/lib/libblas.dll.a'):
 --- a/sage/src/sage/misc/cython.py
 +++ b/sage/src/sage/misc/cython.py
-@@ -31,10 +31,9 @@
+@@ -35,10 +35,9 @@
  
  
  # CBLAS can be one of multiple implementations
diff --git a/debian/patches/d0-libgap-sage.patch b/debian/patches/d0-libgap-sage.patch
index bdb7a30..6b576d8 100644
--- a/debian/patches/d0-libgap-sage.patch
+++ b/debian/patches/d0-libgap-sage.patch
@@ -56,7 +56,7 @@ Forwarded: not-needed
      "m", "readline", "Lfunction" ,
  ] + cblas_libs + zlib_libs
  
-@@ -610,15 +614,15 @@
+@@ -588,15 +592,15 @@
  
      Extension('sage.libs.gap.util',
                sources = ["sage/libs/gap/util.pyx"],
diff --git a/debian/patches/d0-pari-2.9-revert-23544.patch b/debian/patches/d0-pari-2.9-revert-23544.patch
index 0b09dd1..1192fa8 100644
--- a/debian/patches/d0-pari-2.9-revert-23544.patch
+++ b/debian/patches/d0-pari-2.9-revert-23544.patch
@@ -154,7 +154,7 @@ Subject: Fix doctests for PARI upgrade
                To:   Number Field in a with defining polynomial 2*x^4 + 6*x^2 + 1/2
 --- a/sage/src/sage/rings/number_field/number_field_ideal.py
 +++ b/sage/src/sage/rings/number_field/number_field_ideal.py
-@@ -2726,7 +2726,7 @@
+@@ -2709,7 +2709,7 @@
              Fractional ideal (a^2 - 4*a + 2)
              68
              sage: r = A.element_1_mod(B); r
diff --git a/debian/patches/d0-paths.patch b/debian/patches/d0-paths.patch
index 1caf559..8050245 100644
--- a/debian/patches/d0-paths.patch
+++ b/debian/patches/d0-paths.patch
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/sage/src/sage/misc/cython.py
 +++ b/sage/src/sage/misc/cython.py
-@@ -468,7 +468,7 @@
+@@ -528,7 +528,7 @@
      extra_sources = []
      for fname in additional_source_files:
          fname = fname.replace("$SAGE_SRC", SAGE_SRC)
diff --git a/debian/patches/d0-singular.patch b/debian/patches/d0-singular.patch
index 83f9ef6..fb2bf1c 100644
--- a/debian/patches/d0-singular.patch
+++ b/debian/patches/d0-singular.patch
@@ -29,7 +29,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
 --- a/sage/src/sage/misc/cython.py
 +++ b/sage/src/sage/misc/cython.py
-@@ -271,6 +271,11 @@
+@@ -326,6 +326,11 @@
      args = ['-w','-O2'] + args
      libdirs = cblas_library_dirs
  
diff --git a/debian/patches/d1-disable-post-install-tests.patch b/debian/patches/d1-disable-post-install-tests.patch
index a23cbd8..6d924f1 100644
--- a/debian/patches/d1-disable-post-install-tests.patch
+++ b/debian/patches/d1-disable-post-install-tests.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/misc/sage_ostools.py
 +++ b/sage/src/sage/misc/sage_ostools.py
-@@ -24,8 +24,6 @@
+@@ -27,8 +27,6 @@
          True
          sage: have_program('there_is_not_a_program_with_this_name')
          False
@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      """
 --- a/sage/src/sage/all.py
 +++ b/sage/src/sage/all.py
-@@ -290,14 +290,6 @@
+@@ -288,14 +288,6 @@
  
      The non-existence of this file will be used as a trigger to run
      ``sage-starts`` during the Sage build.
diff --git a/debian/patches/d1-install-paths.patch b/debian/patches/d1-install-paths.patch
index bb1cb58..fe5d9c0 100644
--- a/debian/patches/d1-install-paths.patch
+++ b/debian/patches/d1-install-paths.patch
@@ -70,7 +70,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      import distutils.sysconfig
 --- a/sage/configure.ac
 +++ b/sage/configure.ac
-@@ -1037,8 +1037,7 @@
+@@ -1056,8 +1056,7 @@
                  AC_MSG_ERROR([[Cannot perform incremental update, run "make distclean && make"]])
              fi
          else
diff --git a/debian/patches/d1-multiarch-python-paths.patch b/debian/patches/d1-multiarch-python-paths.patch
index 9c14673..3f6c820 100644
--- a/debian/patches/d1-multiarch-python-paths.patch
+++ b/debian/patches/d1-multiarch-python-paths.patch
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  EMBEDDED_MODE = False
  from sage.env import SAGE_SRC
  
-@@ -1244,7 +1245,12 @@
+@@ -1272,7 +1273,12 @@
      except TypeError: # this happens for Python builtins
          return ''
      if sourcefile.endswith(loadable_module_extension()):
diff --git a/debian/patches/d1-sage-env.patch b/debian/patches/d1-sage-env.patch
index 8dce2a0..a3d2bac 100644
--- a/debian/patches/d1-sage-env.patch
+++ b/debian/patches/d1-sage-env.patch
@@ -171,7 +171,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
    run ``make doc-clean``, because the presence, or lack, of pictures
 --- a/sage/src/sage/structure/sage_object.pyx
 +++ b/sage/src/sage/structure/sage_object.pyx
-@@ -1597,7 +1597,7 @@
+@@ -1579,7 +1579,7 @@
  
      When run with no arguments :meth:`unpickle_all` tests that all of the
      "standard" pickles stored in the pickle_jar at
diff --git a/debian/patches/d1-test-optional.patch b/debian/patches/d1-test-optional.patch
index e988418..2f08e76 100644
--- a/debian/patches/d1-test-optional.patch
+++ b/debian/patches/d1-test-optional.patch
@@ -3,7 +3,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
 
 --- a/sage/src/sage/doctest/control.py
 +++ b/sage/src/sage/doctest/control.py
-@@ -323,22 +323,6 @@
+@@ -320,22 +320,6 @@
              if "all" in options.optional:
                  # Special case to run all optional tests
                  options.optional = True
diff --git a/debian/patches/df-python_security.patch b/debian/patches/df-python_security.patch
index ac761d3..2aa792a 100644
--- a/debian/patches/df-python_security.patch
+++ b/debian/patches/df-python_security.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/sage/doctest/control.py
 +++ b/sage/src/sage/doctest/control.py
-@@ -558,19 +558,20 @@
+@@ -555,19 +555,20 @@
          ``sage/tests/cmdline.py`` for a doctest that this works, see
          also :trac:`13579`.
  
diff --git a/debian/patches/u1-scripts-dir.patch b/debian/patches/u1-scripts-dir.patch
index 33cd9db..055b108 100644
--- a/debian/patches/u1-scripts-dir.patch
+++ b/debian/patches/u1-scripts-dir.patch
@@ -159,7 +159,7 @@ Forwarded: TODO
                       or a DocTestDefaults object (possibly with some entries modified)
          - args -- a list of filenames to doctest
  
-@@ -971,9 +971,9 @@
+@@ -963,9 +963,9 @@
              sage: from sage.doctest.control import DocTestDefaults, DocTestController
              sage: DC = DocTestController(DocTestDefaults(timeout=123), ["hello_world.py"])
              sage: print(DC._assemble_cmd())
@@ -171,7 +171,7 @@ Forwarded: TODO
          opt = dict_difference(self.options.__dict__, DocTestDefaults().__dict__)
          for o in ("all", "sagenb"):
              if o in opt:
-@@ -1007,14 +1007,14 @@
+@@ -999,14 +999,14 @@
              sage: DD = DocTestDefaults(gdb=True)
              sage: DC = DocTestController(DD, ["hello_world.py"])
              sage: DC.run_val_gdb(testing=True)
diff --git a/debian/patches/u2-fix-trivial-test-cases.patch b/debian/patches/u2-fix-trivial-test-cases.patch
index 2878374..24d4127 100644
--- a/debian/patches/u2-fix-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-trivial-test-cases.patch
@@ -19,7 +19,7 @@ Forwarded: TODO
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/calculus/calculus.py
 +++ b/sage/src/sage/calculus/calculus.py
-@@ -767,7 +767,7 @@
+@@ -769,7 +769,7 @@
      Now numerically integrating, we see why the answer is wrong::
  
          sage: f.nintegrate(x,0,1)

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

More information about the debian-science-commits mailing list