[sagemath] 02/02: Organise patches

[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 c1678341a3e1f3e26f328b6d3f8dbda26dc03107
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Jul 8 14:22:19 2016 +0200

    Organise patches
---
 ...multiarch-path.patch => debian-cysignals.patch} |  0
 ...{use-gsl-cblas.patch => debian-gsl-cblas.patch} |  0
 .../patches/{maxima.patch => debian-maxima.patch}  |  0
 .../{nauty-bin-rename.patch => debian-nauty.patch} |  0
 debian/patches/{pari.patch => debian-pari.patch}   |  0
 .../patches/{unbreak.patch => debian-paths.patch}  |  2 +-
 ...ecutables_renames.patch => debian-rubiks.patch} |  0
 ...{singular_build.patch => debian-singular.patch} |  0
 ...oc.patch => debian-temp-userdir-singular.patch} |  0
 ..._in_userdir.patch => debian-temp-userdir.patch} |  0
 .../{mpfi-fix-api.patch => fixsage-mpfi.patch}     |  0
 debian/patches/python_security.patch               |  2 +-
 debian/patches/series                              | 39 ++++++++++++++--------
 ...80186.patch => silence_debian_bug_780186.patch} |  0
 ...anarity-update.patch => update-planarity.patch} |  0
 .../{sphinx-update.patch => update-sphinx.patch}   |  0
 16 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/debian/patches/cysignals-multiarch-path.patch b/debian/patches/debian-cysignals.patch
similarity index 100%
rename from debian/patches/cysignals-multiarch-path.patch
rename to debian/patches/debian-cysignals.patch
diff --git a/debian/patches/use-gsl-cblas.patch b/debian/patches/debian-gsl-cblas.patch
similarity index 100%
rename from debian/patches/use-gsl-cblas.patch
rename to debian/patches/debian-gsl-cblas.patch
diff --git a/debian/patches/maxima.patch b/debian/patches/debian-maxima.patch
similarity index 100%
rename from debian/patches/maxima.patch
rename to debian/patches/debian-maxima.patch
diff --git a/debian/patches/nauty-bin-rename.patch b/debian/patches/debian-nauty.patch
similarity index 100%
rename from debian/patches/nauty-bin-rename.patch
rename to debian/patches/debian-nauty.patch
diff --git a/debian/patches/pari.patch b/debian/patches/debian-pari.patch
similarity index 100%
rename from debian/patches/pari.patch
rename to debian/patches/debian-pari.patch
diff --git a/debian/patches/unbreak.patch b/debian/patches/debian-paths.patch
similarity index 99%
rename from debian/patches/unbreak.patch
rename to debian/patches/debian-paths.patch
index 25b2d32..b2e4a5d 100644
--- a/debian/patches/unbreak.patch
+++ b/debian/patches/debian-paths.patch
@@ -176,7 +176,7 @@
          else:
 --- a/sage/src/sage/tests/cmdline.py
 +++ b/sage/src/sage/tests/cmdline.py
-@@ -550,12 +550,6 @@
+@@ -551,12 +551,6 @@
          sage: ret
          0
  
diff --git a/debian/patches/rubiks_executables_renames.patch b/debian/patches/debian-rubiks.patch
similarity index 100%
rename from debian/patches/rubiks_executables_renames.patch
rename to debian/patches/debian-rubiks.patch
diff --git a/debian/patches/singular_build.patch b/debian/patches/debian-singular.patch
similarity index 100%
rename from debian/patches/singular_build.patch
rename to debian/patches/debian-singular.patch
diff --git a/debian/patches/singular_doc.patch b/debian/patches/debian-temp-userdir-singular.patch
similarity index 100%
rename from debian/patches/singular_doc.patch
rename to debian/patches/debian-temp-userdir-singular.patch
diff --git a/debian/patches/python_installs_in_userdir.patch b/debian/patches/debian-temp-userdir.patch
similarity index 100%
rename from debian/patches/python_installs_in_userdir.patch
rename to debian/patches/debian-temp-userdir.patch
diff --git a/debian/patches/mpfi-fix-api.patch b/debian/patches/fixsage-mpfi.patch
similarity index 100%
rename from debian/patches/mpfi-fix-api.patch
rename to debian/patches/fixsage-mpfi.patch
diff --git a/debian/patches/python_security.patch b/debian/patches/python_security.patch
index d31a9d0..e809434 100644
--- a/debian/patches/python_security.patch
+++ b/debian/patches/python_security.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/sage/doctest/control.py
 +++ b/sage/src/sage/doctest/control.py
-@@ -469,19 +469,20 @@
+@@ -467,19 +467,20 @@
          ``sage/tests/cmdline.py`` for a doctest that this works, see
          also :trac:`13579`.
  
diff --git a/debian/patches/series b/debian/patches/series
index 4f2c33e..fd09b2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,19 +1,30 @@
-unbreak.patch
-maxima.patch
-singular_build.patch
-singular_doc.patch
+# fixes to Sage's code, an inherent problem on their side
+# we should probably forward these upstream
 python_security.patch
-silent_debian_bug_780186.patch
+silence_debian_bug_780186.patch
 silence_ecl_opt_signals.patch
 sagedoc_avoid_exception.patch
-rubiks_executables_renames.patch
-pari.patch
-nauty-bin-rename.patch
-planarity-update.patch
-use-gsl-cblas.patch
-mpfi-fix-api.patch
-cysignals-multiarch-path.patch
-sphinx-update.patch
+fixsage-mpfi.patch
 #temp-disable-parallel-sphinx.patch
+
+# due to us using a different version of a dependency than what Sage uses
+# we'll probably drop these when importing the next version of Sage
+update-planarity.patch
+update-sphinx.patch
 update-libgap.patch
-python_installs_in_userdir.patch
+
+# due to Debian's inherent differences with upstream;
+# we're unlikely to forward these upstream
+debian-paths.patch
+debian-maxima.patch
+debian-singular.patch
+debian-rubiks.patch
+debian-pari.patch
+debian-nauty.patch
+debian-gsl-cblas.patch
+debian-cysignals.patch
+
+# temporary patches for whatever reason
+# they will eventually be gotten rid of
+debian-temp-userdir-singular.patch
+debian-temp-userdir.patch
diff --git a/debian/patches/silent_debian_bug_780186.patch b/debian/patches/silence_debian_bug_780186.patch
similarity index 100%
rename from debian/patches/silent_debian_bug_780186.patch
rename to debian/patches/silence_debian_bug_780186.patch
diff --git a/debian/patches/planarity-update.patch b/debian/patches/update-planarity.patch
similarity index 100%
rename from debian/patches/planarity-update.patch
rename to debian/patches/update-planarity.patch
diff --git a/debian/patches/sphinx-update.patch b/debian/patches/update-sphinx.patch
similarity index 100%
rename from debian/patches/sphinx-update.patch
rename to debian/patches/update-sphinx.patch

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