[sagemath] 01/01: Reorder patches with respect to upstreaming status.

Sun Feb 26 20:30:33 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 5cbac7ef374dfb144a8b4f9c75e6f89bb6aa3554
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Feb 26 20:30:17 2017 +0000

    Reorder patches with respect to upstreaming status.
---
 debian/patches/series                               | 21 ++++++++++-----------
 ...ersion.patch => u0-dont-test-glpk-version.patch} |  1 +
 ...temwide.patch => u0-fix-libgap-systemwide.patch} |  2 ++
 ...fix-preexec-fn.patch => u0-fix-preexec-fn.patch} |  1 +
 ...tch => u0-singular-include-path-for-pynac.patch} |  1 +
 ...c.patch => u1-fix-atrocious-symlink-logic.patch} |  2 +-
 debian/patches/u1-fix-dont-require-DISPLAY.patch    |  2 +-
 debian/patches/u1-fix-proper-scipy-rtol.patch       |  2 +-
 debian/patches/u1-fix-use-lexists-not-exists.patch  |  2 +-
 ...ename.patch => u1-looser-doctest-basename.patch} |  2 +-
 ...dlib-094h.patch => u2-version-cddlib-094h.patch} |  0
 11 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 19420f4..c7cbcec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,26 +3,25 @@
 u0-version-pari-2.9.patch
 u0-version-singular-4.1.0p2.patch
 u0-version-pynac-0.7.4.patch
+u0-fix-libgap-systemwide.patch
+u0-singular-include-path-for-pynac.patch
+u0-dont-test-glpk-version.patch
+u0-fix-preexec-fn.patch
 
-# Uncontroversial fixes to Sage's code
-# We should forward these upstream, and they would probably accept
-u1-pip-nowarn.patch
+# Patches that have open upstream tickets
 u1-version-planarity-3.patch
 u1-version-pbori-boost1.62-hashes.patch
 u1-version-ecm-7.patch
-u1-version-cddlib-094h.patch
-u1-fix-libgap-systemwide.patch
 u1-fix-use-lexists-not-exists.patch
 u1-fix-proper-scipy-rtol.patch
-u1-fix-preexec-fn.patch
 u1-fix-dont-require-DISPLAY.patch
-u1-singular-include-path-for-pynac.patch
-u1-dont-test-glpk-version.patch
+u1-pip-nowarn.patch
+u1-fix-atrocious-symlink-logic.patch
+u1-looser-doctest-basename.patch
 
-# Patches that should be upstreamed, but need a bit more work first
+# Patches that should be upstreamed (may need some work first)
+u2-version-cddlib-094h.patch
 u2-reproducible-docs.patch
-u2-looser-doctest-basename.patch
-u2-fix-atrocious-symlink-logic.patch
 u2-fix-trivial-test-cases.patch
 u2-fix-less-trivial-test-cases.patch
 u2-fix-sympow-cachedir.patch
diff --git a/debian/patches/u1-dont-test-glpk-version.patch b/debian/patches/u0-dont-test-glpk-version.patch
similarity index 93%
rename from debian/patches/u1-dont-test-glpk-version.patch
rename to debian/patches/u0-dont-test-glpk-version.patch
index 5ce1db7..c0ffdaa 100644
--- a/debian/patches/u1-dont-test-glpk-version.patch
+++ b/debian/patches/u0-dont-test-glpk-version.patch
@@ -1,6 +1,7 @@
 Description: Do not test the version of glpk
  The test should not fail just because the version is different.
 Author: Tobias Hansen <thansen at debian.org>
+Forwarded: https://trac.sagemath.org/ticket/22443
 
 --- a/sage/src/sage/numerical/mip.pyx
 +++ b/sage/src/sage/numerical/mip.pyx
diff --git a/debian/patches/u1-fix-libgap-systemwide.patch b/debian/patches/u0-fix-libgap-systemwide.patch
similarity index 99%
rename from debian/patches/u1-fix-libgap-systemwide.patch
rename to debian/patches/u0-fix-libgap-systemwide.patch
index f028c1e..b1fe050 100644
--- a/debian/patches/u1-fix-libgap-systemwide.patch
+++ b/debian/patches/u0-fix-libgap-systemwide.patch
@@ -1,3 +1,5 @@
+Bug: https://trac.sagemath.org/ticket/22437
+
 --- a/sage/src/sage/libs/gap/gap_includes.pxd
 +++ b/sage/src/sage/libs/gap/gap_includes.pxd
 @@ -9,12 +9,12 @@
diff --git a/debian/patches/u1-fix-preexec-fn.patch b/debian/patches/u0-fix-preexec-fn.patch
similarity index 94%
rename from debian/patches/u1-fix-preexec-fn.patch
rename to debian/patches/u0-fix-preexec-fn.patch
index 34e4a04..31eaf96 100644
--- a/debian/patches/u1-fix-preexec-fn.patch
+++ b/debian/patches/u0-fix-preexec-fn.patch
@@ -3,6 +3,7 @@ Description: Work around python bug #1652
  However it is NOT related to Debian bug #844789
 Author: Ximin Luo <infinity0 at debian.org>
 Bug: https://bugs.python.org/issue1652
+Forwarded: https://trac.sagemath.org/ticket/22440
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/interfaces/expect.py
diff --git a/debian/patches/u1-singular-include-path-for-pynac.patch b/debian/patches/u0-singular-include-path-for-pynac.patch
similarity index 91%
rename from debian/patches/u1-singular-include-path-for-pynac.patch
rename to debian/patches/u0-singular-include-path-for-pynac.patch
index b17af95..fae7719 100644
--- a/debian/patches/u1-singular-include-path-for-pynac.patch
+++ b/debian/patches/u0-singular-include-path-for-pynac.patch
@@ -1,6 +1,7 @@
 Description: Compile pynac interface with SINGULAR_CFLAGS to find its headers
  pynac/basic.h includes factory/factory.h so this is needed to find it.
 Author: Tobias Hansen <thansen at debian.org>
+Forwarded: https://trac.sagemath.org/ticket/22442
 
 --- a/sage/src/sage/libs/pynac/pynac.pxd
 +++ b/sage/src/sage/libs/pynac/pynac.pxd
diff --git a/debian/patches/u2-fix-atrocious-symlink-logic.patch b/debian/patches/u1-fix-atrocious-symlink-logic.patch
similarity index 96%
rename from debian/patches/u2-fix-atrocious-symlink-logic.patch
rename to debian/patches/u1-fix-atrocious-symlink-logic.patch
index b98009a..00bdf89 100644
--- a/debian/patches/u2-fix-atrocious-symlink-logic.patch
+++ b/debian/patches/u1-fix-atrocious-symlink-logic.patch
@@ -5,7 +5,7 @@ Description: Fix atrocious logic in symlink()
  that post-install tests don't fail) was easier than trying to figure out if
  removing the file would have other consequences elsewhere.
 Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: TODO
+Forwarded: https://trac.sagemath.org/ticket/22444
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/repl/ipython_kernel/install.py
diff --git a/debian/patches/u1-fix-dont-require-DISPLAY.patch b/debian/patches/u1-fix-dont-require-DISPLAY.patch
index 3917ffc..57d0cb2 100644
--- a/debian/patches/u1-fix-dont-require-DISPLAY.patch
+++ b/debian/patches/u1-fix-dont-require-DISPLAY.patch
@@ -1,7 +1,7 @@
 Description: Don't fail plot.py doctest if DISPLAY is unset
  https://stackoverflow.com/questions/37604289/tkinter-tclerror-no-display-name-and-no-display-environment-variable
 Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: TODO
+Forwarded: https://trac.sagemath.org/ticket/22441
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/plot/plot.py
diff --git a/debian/patches/u1-fix-proper-scipy-rtol.patch b/debian/patches/u1-fix-proper-scipy-rtol.patch
index 9a2d5d9..b282c35 100644
--- a/debian/patches/u1-fix-proper-scipy-rtol.patch
+++ b/debian/patches/u1-fix-proper-scipy-rtol.patch
@@ -3,7 +3,7 @@ Description: Fix Sage's use of scipy rtol parameter
  "The parameter cannot be smaller than its default value of
  ``4*np.finfo(float).eps``" so use that instead of a hard-coded value.
 Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: TODO
+Forwarded: Bug: https://trac.sagemath.org/ticket/22439
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/numerical/optimize.py
diff --git a/debian/patches/u1-fix-use-lexists-not-exists.patch b/debian/patches/u1-fix-use-lexists-not-exists.patch
index 79f40be..ebf7407 100644
--- a/debian/patches/u1-fix-use-lexists-not-exists.patch
+++ b/debian/patches/u1-fix-use-lexists-not-exists.patch
@@ -1,7 +1,7 @@
 Description: Use lexists instead of exists
  os.path.exists returns False for a broken symlink; we want lexists here
 Author: Ximin Luo <infinity0 at debian.org>
-Bug: TODO, file to sage
+Bug: https://trac.sagemath.org/ticket/22438
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage_setup/docbuild/ext/multidocs.py
diff --git a/debian/patches/u2-looser-doctest-basename.patch b/debian/patches/u1-looser-doctest-basename.patch
similarity index 94%
rename from debian/patches/u2-looser-doctest-basename.patch
rename to debian/patches/u1-looser-doctest-basename.patch
index fe33a15..75c4889 100644
--- a/debian/patches/u2-looser-doctest-basename.patch
+++ b/debian/patches/u1-looser-doctest-basename.patch
@@ -2,7 +2,7 @@ Description: Make sage.doctest.sources.get_basename work in more situations
  This lets you specify SAGE_SRC like /path/to/test/dir/../../src/dir, which
  avoids post-install test failures in sage/doctest/test.py
 Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: TODO
+Forwarded: https://trac.sagemath.org/ticket/22445
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/doctest/sources.py
diff --git a/debian/patches/u1-version-cddlib-094h.patch b/debian/patches/u2-version-cddlib-094h.patch
similarity index 100%
rename from debian/patches/u1-version-cddlib-094h.patch
rename to debian/patches/u2-version-cddlib-094h.patch

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

