[sagemath] 02/02: Update d/changelog and refresh patches
Ximin Luo
infinity0 at debian.org
Wed Jul 5 08:09:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository sagemath.
commit 6b3538940921f4784cfa81474fda73ae91b1495c
Author: Ximin Luo <infinity0 at debian.org>
Date: Wed Jul 5 10:09:08 2017 +0200
Update d/changelog and refresh patches
---
debian/changelog | 2 +-
debian/patches/d0-maxima.patch | 2 +-
debian/patches/d1-sage-cli.patch | 49 ++++++++++++++++++-----------------
debian/patches/d1-sage-env.patch | 2 +-
debian/patches/d1-test-optional.patch | 2 +-
debian/patches/u1-scripts-dir.patch | 4 +--
6 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 314ef80..b50f61c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sagemath (8.0~beta12-1) UNRELEASED; urgency=medium
+sagemath (8.0~rc0-1) UNRELEASED; urgency=medium
[ Tobias Hansen ]
* New upstream version.
diff --git a/debian/patches/d0-maxima.patch b/debian/patches/d0-maxima.patch
index e5a0717..c850ad5 100644
--- a/debian/patches/d0-maxima.patch
+++ b/debian/patches/d0-maxima.patch
@@ -84,7 +84,7 @@ Author: Tobias Hansen <thansen at debian.org>
...
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -540,7 +540,7 @@
+@@ -542,7 +542,7 @@
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
diff --git a/debian/patches/d1-sage-cli.patch b/debian/patches/d1-sage-cli.patch
index f3201ae..63fdd14 100644
--- a/debian/patches/d1-sage-cli.patch
+++ b/debian/patches/d1-sage-cli.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -13,20 +13,15 @@
+@@ -13,13 +13,9 @@
echo " file.[sage|py|spyx] -- run given .sage, .py or .spyx file"
echo " -advanced -- list all command line options"
echo " -c <cmd> -- Evaluates cmd as sage code"
@@ -21,14 +21,15 @@ Forwarded: not-needed
echo " -inotebook [...] -- start the *insecure* Sage notebook (deprecated)"
echo " -maxima [...] -- run Sage's Maxima with given arguments"
echo " -mwrank [...] -- run Sage's mwrank with given arguments"
- echo " --notebook=[...] -- start the Sage notebook (valid options are"
+@@ -27,7 +23,6 @@
echo " 'default', 'sagenb', 'jupyter', and 'export')"
+ echo " Current default is 'export' from sagenb to jupyter"
echo " -n, --notebook -- shortcut for --notebook=default"
- echo " -optional -- list all optional packages that can be installed"
echo " -python [...] -- run the Python 2 interpreter"
echo " -python3 [...] -- run the Python 3 interpreter"
echo " -R [...] -- run Sage's R with given arguments"
-@@ -43,10 +38,6 @@
+@@ -44,10 +39,6 @@
echo " --optional - controls which optional tests are run"
echo " --sagenb - test all sagenb files"
echo " --help - show all testing options"
@@ -39,7 +40,7 @@ Forwarded: not-needed
echo " -v, -version -- display Sage version information"
exit 0
}
-@@ -69,7 +60,6 @@
+@@ -70,7 +61,6 @@
echo " -- pass the option through to ipython"
echo " -v, -version -- display Sage version information"
echo " -dumpversion -- print Sage version"
@@ -47,7 +48,7 @@ Forwarded: not-needed
echo
#### 1.......................26..................................................78
-@@ -80,8 +70,6 @@
+@@ -82,8 +72,6 @@
echo " See the output of sage --notebook --help"
echo " for more details and examples of how to pass"
echo " optional arguments"
@@ -56,7 +57,7 @@ Forwarded: not-needed
echo " -inotebook [...] -- start the *insecure* Sage notebook (deprecated)"
echo " -n, -notebook [...] -- start the default Sage notebook (options are the"
echo " same as for the notebook command in Sage). See the"
-@@ -95,7 +83,6 @@
+@@ -97,7 +85,6 @@
echo " -cython [...] -- run Cython with given arguments"
echo " -ecl [...] -- run Common Lisp"
echo " -gap [...] -- run Sage's Gap with given arguments"
@@ -64,7 +65,7 @@ Forwarded: not-needed
echo " -gdb -- run Sage under the control of gdb"
echo " -gp [...] -- run Sage's PARI/GP calculator with given arguments"
echo " -ipython [...] -- run Sage's IPython using the default environment (not"
-@@ -114,7 +101,6 @@
+@@ -116,7 +103,6 @@
echo " (not installed currently, run sage -i polymake)"
echo " -python [...] -- run the Python interpreter"
echo " -R [...] -- run Sage's R with given arguments"
@@ -72,7 +73,7 @@ Forwarded: not-needed
echo " -sh [...] -- run \$SHELL ($SHELL) with Sage environment variables"
echo " -singular [...] -- run Sage's singular with given arguments"
echo " -sqlite3 [...] -- run Sage's sqlite3 with given arguments"
-@@ -123,55 +109,7 @@
+@@ -125,55 +111,7 @@
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@@ -129,7 +130,7 @@ Forwarded: not-needed
echo " -startuptime [module] -- display how long each component of Sage takes to"
echo " start up; optionally specify a module to get more"
echo " details about that particular module"
-@@ -180,9 +118,7 @@
+@@ -182,9 +120,7 @@
echo " selected options:"
echo " --long - include lines with the phrase 'long time'"
echo " --verbose - print debugging output during the test"
@@ -139,7 +140,7 @@ Forwarded: not-needed
echo " --initial - only show the first failure per block"
echo " --debug - drop into PDB after an unexpected error"
echo " --failed - only test files that failed last test"
-@@ -198,9 +134,6 @@
+@@ -200,9 +136,6 @@
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
echo "Documentation:"
@@ -149,7 +150,7 @@ Forwarded: not-needed
echo " -docbuild [lang/]<document> <html|pdf|...> -- Build the Sage documentation"
echo " -search_src <string> -- search through all the Sage library code for string"
echo " -search_doc <string> -- search through the Sage documentation for string"
-@@ -223,16 +156,6 @@
+@@ -225,16 +158,6 @@
echo
#### 1.......................26..................................................78
#### |.....................--.|...................................................|
@@ -166,7 +167,7 @@ Forwarded: not-needed
echo "Valgrind memory debugging:"
echo " -cachegrind -- run Sage using Valgrind's cachegrind tool. The log"
echo " files are named sage-cachegrind.PID can be found in"
-@@ -273,91 +196,6 @@
+@@ -275,91 +198,6 @@
exit $status
fi
@@ -258,7 +259,7 @@ Forwarded: not-needed
#####################################################################
# Source sage-env ($0 is the name of this "sage" script, so we can just
-@@ -383,29 +221,10 @@
+@@ -385,29 +223,10 @@
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
@@ -290,7 +291,7 @@ Forwarded: not-needed
sage-cleaner &>/dev/null &
}
-@@ -483,11 +302,6 @@
+@@ -485,11 +304,6 @@
exec gap "$@"
fi
@@ -302,7 +303,7 @@ Forwarded: not-needed
if [ "$1" = '-gp' -o "$1" = '--gp' ]; then
shift
exec gp "$@"
-@@ -533,11 +347,6 @@
+@@ -535,11 +349,6 @@
exec kash "$@"
fi
@@ -314,7 +315,7 @@ Forwarded: not-needed
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima-sage "$@"
-@@ -553,21 +362,6 @@
+@@ -555,21 +364,6 @@
exec M2 "$@"
fi
@@ -336,7 +337,7 @@ Forwarded: not-needed
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
exec python "$@"
-@@ -598,11 +392,6 @@
+@@ -600,11 +394,6 @@
exec git "$@"
fi
@@ -348,7 +349,7 @@ Forwarded: not-needed
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
# AUTHORS:
# - Carl Witty and William Stein: initial version
-@@ -722,20 +511,6 @@
+@@ -724,20 +513,6 @@
fi
#####################################################################
@@ -369,7 +370,7 @@ Forwarded: not-needed
# File conversion
#####################################################################
-@@ -758,11 +533,6 @@
+@@ -760,11 +535,6 @@
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@@ -381,7 +382,7 @@ Forwarded: not-needed
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
sage-cleaner &>/dev/null &
exec sage-notebook "$@"
-@@ -773,13 +543,6 @@
+@@ -775,13 +545,6 @@
exec sage-notebook "$@"
fi
@@ -395,7 +396,7 @@ Forwarded: not-needed
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
-@@ -798,34 +561,15 @@
+@@ -800,34 +563,15 @@
exit 0
fi
@@ -432,7 +433,7 @@ Forwarded: not-needed
shift
exec sage-runtests -p "$@"
else
-@@ -834,16 +578,6 @@
+@@ -836,16 +580,6 @@
fi
fi
@@ -449,7 +450,7 @@ Forwarded: not-needed
if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
shift
SAGE_BANNER=no sage_setup
-@@ -858,114 +592,6 @@
+@@ -860,114 +594,6 @@
exec sage-eval "$@"
fi
@@ -564,7 +565,7 @@ Forwarded: not-needed
if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
shift
exec python -m "sage_setup.docbuild" "$@"
-@@ -1037,10 +663,6 @@
+@@ -1039,10 +665,6 @@
fi
if [ $# -ge 1 ]; then
diff --git a/debian/patches/d1-sage-env.patch b/debian/patches/d1-sage-env.patch
index 99de714..0b45e82 100644
--- a/debian/patches/d1-sage-env.patch
+++ b/debian/patches/d1-sage-env.patch
@@ -7,7 +7,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -202,7 +202,12 @@
+@@ -204,7 +204,12 @@
# append -env to that). We redirect stdout to stderr, which is safer
# for scripts.
#####################################################################
diff --git a/debian/patches/d1-test-optional.patch b/debian/patches/d1-test-optional.patch
index 5d10cb0..50703e2 100644
--- a/debian/patches/d1-test-optional.patch
+++ b/debian/patches/d1-test-optional.patch
@@ -28,7 +28,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
self.files = args
--- a/sage/src/sage/doctest/test.py
+++ b/sage/src/sage/doctest/test.py
-@@ -466,14 +466,6 @@
+@@ -463,14 +463,6 @@
...
0
diff --git a/debian/patches/u1-scripts-dir.patch b/debian/patches/u1-scripts-dir.patch
index db90730..6d3724c 100644
--- a/debian/patches/u1-scripts-dir.patch
+++ b/debian/patches/u1-scripts-dir.patch
@@ -15,7 +15,7 @@ Forwarded: TODO
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -453,13 +453,13 @@
+@@ -455,13 +455,13 @@
#####################################################################
if [ "$1" = '-dumpversion' -o "$1" = '--dumpversion' ]; then
@@ -31,7 +31,7 @@ Forwarded: TODO
echo "SageMath version ${SAGE_VERSION}, Release Date: ${SAGE_RELEASE_DATE}"
exit 0
fi
-@@ -975,14 +975,14 @@
+@@ -977,14 +977,14 @@
shift
sage_setup
if [ "$SAGE_DEBUG" = "no" ]; then
--
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