[sagemath] 02/02: Add some notes on how to reduce these patches making them generic and forwarding them upstream

Sat Oct 15 12:40:45 UTC 2016

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

infinity0 pushed a commit to branch master
in repository sagemath.

commit c29dd51207f6c9a8c365df0038db5109b086ece9
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sat Oct 15 14:39:40 2016 +0200

    Add some notes on how to reduce these patches making them generic and forwarding them upstream
    
    Also TBD -> TODO, so we only have to grep for one thing
---
 debian/patches/debian-fix-trivial-test-cases.patch       | 2 +-
 debian/patches/debian-install-paths.patch                | 3 +++
 debian/patches/debian-paths.patch                        | 3 +++
 debian/patches/debian-sage-gap-reset.patch               | 2 +-
 debian/patches/fixsage-allow-override-sage-local.patch   | 2 +-
 debian/patches/fixsage-mpfi.patch                        | 4 ++--
 debian/patches/fixsage-proper-scipy-rtol.patch           | 2 +-
 debian/patches/fixsage-sphinx.patch                      | 2 +-
 debian/patches/version-cddlib-094h.patch                 | 2 +-
 debian/patches/version-planarity-3.patch                 | 4 ++--
 debian/patches/version-temp-singular-4-extra-fixes.patch | 2 +-
 11 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debian/patches/debian-fix-trivial-test-cases.patch b/debian/patches/debian-fix-trivial-test-cases.patch
index 35bba1d..85afcd2 100644
--- a/debian/patches/debian-fix-trivial-test-cases.patch
+++ b/debian/patches/debian-fix-trivial-test-cases.patch
@@ -14,7 +14,7 @@ Description: Fix trivial test cases to work
  - any minute concrete non-identical floating point differences
  since these might indicate deeper bugs and we don't want to hide those.
 Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: TBD
+Forwarded: TODO
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/interfaces/maxima_abstract.py
diff --git a/debian/patches/debian-install-paths.patch b/debian/patches/debian-install-paths.patch
index 17b8dc4..ab17371 100644
--- a/debian/patches/debian-install-paths.patch
+++ b/debian/patches/debian-install-paths.patch
@@ -1,4 +1,7 @@
 Description: Install to Debian paths
+ TODO: upstream hard-codes "site-packages" in a bunch of places; these should
+ be fixed to use SAGE_LIB instead and forwarded upstream. Then this patch could
+ be a lot smaller.
 Author: Tobias Hansen <thansen at debian.org>
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
diff --git a/debian/patches/debian-paths.patch b/debian/patches/debian-paths.patch
index 80cb7fb..fa23abd 100644
--- a/debian/patches/debian-paths.patch
+++ b/debian/patches/debian-paths.patch
@@ -1,4 +1,7 @@
 Description: Hard-code paths to external system run-time dependencies
+ TODO: some of this could be made generic and forwarded upstream. For example,
+ add another SAGE_SHARE_DATA directory, which for upstream would be the same
+ as SAGE_SHARE and for us would be /usr/share/sagemeth.
 Author: Tobias Hansen <thansen at debian.org>
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
diff --git a/debian/patches/debian-sage-gap-reset.patch b/debian/patches/debian-sage-gap-reset.patch
index d0e364c..d3b604b 100644
--- a/debian/patches/debian-sage-gap-reset.patch
+++ b/debian/patches/debian-sage-gap-reset.patch
@@ -2,7 +2,7 @@ Description: Reset the sage-local gap workspace before the first test
  Otherwise it causes test errors, if the workspace contains files from older
  versions of gap.
 Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: not-needed / TBD
+Forwarded: not-needed / TODO
 # it's upstream's bug but they are likely to not bother, since they control their "GAP version"
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/fixsage-allow-override-sage-local.patch b/debian/patches/fixsage-allow-override-sage-local.patch
index 65b4759..d2f472f 100644
--- a/debian/patches/fixsage-allow-override-sage-local.patch
+++ b/debian/patches/fixsage-allow-override-sage-local.patch
@@ -3,7 +3,7 @@ Description: Allow SAGE_LOCAL to be overridden from outside the Makefiles
  However, keep SAGE_SPKG_INST relative to SAGE_ROOT rather than SAGE_LOCAL
  since that would be a more intrusive change.
 Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: TBD
+Forwarded: TODO
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/bin/sage-env
diff --git a/debian/patches/fixsage-mpfi.patch b/debian/patches/fixsage-mpfi.patch
index 160f017..fb92317 100644
--- a/debian/patches/fixsage-mpfi.patch
+++ b/debian/patches/fixsage-mpfi.patch
@@ -3,8 +3,8 @@ Description: Remove private MPFI functions
  mark these as private in src/mpfi-impl.h, and Sage should not be attempting
  to link to or use them in its Cython modules.
 Author: Ximin Luo <infinity0 at debian.org>
-Bug: TBD
-Forwarded: TBD
+Bug: TODO
+Forwarded: TODO
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/libs/mpfi.pxd
diff --git a/debian/patches/fixsage-proper-scipy-rtol.patch b/debian/patches/fixsage-proper-scipy-rtol.patch
index 425f83c..750b74c 100644
--- a/debian/patches/fixsage-proper-scipy-rtol.patch
+++ b/debian/patches/fixsage-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: TBD
+Forwarded: TODO
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/numerical/optimize.py
diff --git a/debian/patches/fixsage-sphinx.patch b/debian/patches/fixsage-sphinx.patch
index 109be71..1f6185e 100644
--- a/debian/patches/fixsage-sphinx.patch
+++ b/debian/patches/fixsage-sphinx.patch
@@ -1,6 +1,6 @@
 Description: Disable a convoluted "build log buffering" mechanism which was causing problems.
 Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: TBD
+Forwarded: TODO
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage_setup/docbuild/sphinxbuild.py
diff --git a/debian/patches/version-cddlib-094h.patch b/debian/patches/version-cddlib-094h.patch
index baf73d3..cf92b47 100644
--- a/debian/patches/version-cddlib-094h.patch
+++ b/debian/patches/version-cddlib-094h.patch
@@ -1,6 +1,6 @@
 Description: Use cddlib version 094h
 Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: TBD
+Forwarded: TODO
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/geometry/polyhedron/backend_cdd.py
diff --git a/debian/patches/version-planarity-3.patch b/debian/patches/version-planarity-3.patch
index 4a3ed48..5828230 100644
--- a/debian/patches/version-planarity-3.patch
+++ b/debian/patches/version-planarity-3.patch
@@ -2,8 +2,8 @@ Description: Update Sage's planarity module to use API v3
  Sage uses 2.2.0 but the API difference from planarity 3 is not too bad.
  So let's try this instead of backporting planarity 2.2.0 to Debian.
 Author: Ximin Luo <infinity0 at debian.org>
-Bug: TBD
-Forwarded: TBD
+Bug: TODO
+Forwarded: TODO
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage/graphs/planarity.pyx
diff --git a/debian/patches/version-temp-singular-4-extra-fixes.patch b/debian/patches/version-temp-singular-4-extra-fixes.patch
index b522760..bd153de 100644
--- a/debian/patches/version-temp-singular-4-extra-fixes.patch
+++ b/debian/patches/version-temp-singular-4-extra-fixes.patch
@@ -3,7 +3,7 @@ Description: Use -b when running Singular CLI
  We should also forward this to Sage upstream.
 Author: Ximin Luo <infinity0 at debian.org>
 Bug: https://www.singular.uni-kl.de:8005/trac/ticket/775
-Forwarded: TBD, to Sage
+Forwarded: TODO, to Sage
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/bin/sage

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

