[sagemath] 10/14: Delete 2 obsolete patches, finish refreshing.

[Tobias Hansen]

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

thansen pushed a commit to branch sage-7.4
in repository sagemath.

commit ed8a489da06fdf2f71e63f486e297494a762fc33
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Tue Oct 25 00:08:09 2016 +0000

    Delete 2 obsolete patches, finish refreshing.
---
 debian/patches/debian-temp-userdir.patch           | 42 ----------------------
 debian/patches/series                              |  2 --
 debian/patches/temp-cython-include-source.patch    |  2 +-
 debian/patches/temp-fix-more-tests.patch           | 21 -----------
 .../version-temp-singular-4-extra-fixes.patch      |  2 +-
 5 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/debian/patches/debian-temp-userdir.patch b/debian/patches/debian-temp-userdir.patch
deleted file mode 100644
index 97cb0f2..0000000
--- a/debian/patches/debian-temp-userdir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Install Sage spkgs to user's home directory
- This is a temporary measure to get everything working quickly.
- Eventually we will get rid of this, and add them to the pruner.
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/build/pkgs/sagenb_export/spkg-install
-+++ b/sage/build/pkgs/sagenb_export/spkg-install
-@@ -1,7 +1,7 @@
- #!/usr/bin/env bash
- 
- cd src
--python setup.py install
-+python setup.py install --user
- if [ $? -ne 0 ]; then
-     echo >&2 "Error installing SageNB Export"
-     exit 1
---- a/sage/build/pkgs/widgetsnbextension/spkg-install
-+++ b/sage/build/pkgs/widgetsnbextension/spkg-install
-@@ -1,3 +1,3 @@
- #!/usr/bin/env bash
- 
--cd src && python setup.py install
-+cd src && python setup.py install --user
---- a/sage/build/pkgs/ipywidgets/spkg-install
-+++ b/sage/build/pkgs/ipywidgets/spkg-install
-@@ -1,3 +1,3 @@
- #!/usr/bin/env bash
- 
--cd src && python setup.py install
-+cd src && python setup.py install --user
---- a/sage/build/pkgs/notebook/spkg-install
-+++ b/sage/build/pkgs/notebook/spkg-install
-@@ -12,7 +12,7 @@
- done
- 
- 
--python setup.py install
-+python setup.py install --user
- 
- # Install the Jupyter notebook configuration
- ETC_JUPYTER="$SAGE_ETC"/jupyter
diff --git a/debian/patches/series b/debian/patches/series
index e0247be..b5119bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,6 +44,4 @@ temp-disable-parallel-sphinx.patch
 temp-cython-include-source.patch
 version-temp-singular-4-extra-fixes.patch
 version-temp-glpk-4.60-extra-hacky-fixes.patch
-temp-fix-more-tests.patch
-debian-temp-userdir.patch
 debian-temp-r-no-readline.patch
diff --git a/debian/patches/temp-cython-include-source.patch b/debian/patches/temp-cython-include-source.patch
index b0ceeaf..d7e488a 100644
--- a/debian/patches/temp-cython-include-source.patch
+++ b/debian/patches/temp-cython-include-source.patch
@@ -4,7 +4,7 @@ Author: Tobias Hansen <thansen at debian.org>
 
 --- a/sage/src/sage/misc/cython.py
 +++ b/sage/src/sage/misc/cython.py
-@@ -232,7 +232,7 @@
+@@ -235,7 +235,7 @@
      additional_source_files, s = parse_keywords('cfile', s)
  
      v, s = parse_keywords('cinclude', s)
diff --git a/debian/patches/temp-fix-more-tests.patch b/debian/patches/temp-fix-more-tests.patch
deleted file mode 100644
index 28a1a4f..0000000
--- a/debian/patches/temp-fix-more-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Update a failing test case as per upstream
- Backport a small part of upstream commit, to fix 1 failing test case
-Author: Ralf Stephan <ralf at ark.in-berlin.de>
-Applied-Upstream: commit:3784da9e71986de287be1d6c3dca0f1d3473ead3
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/src/sage/functions/log.py
-+++ b/sage/src/sage/functions/log.py
-@@ -359,8 +359,10 @@
-             1/6*pi^2
-             sage: polylog(2,x^2+1)
-             polylog(2, x^2 + 1)
--            sage: polylog(4,0.5)
--            polylog(4, 0.500000000000000)
-+            sage: polylog(4, 1/2)
-+            polylog(4, 1/2)
-+            sage: polylog(4, 0.5)
-+            0.517479061673899
- 
-             sage: f = polylog(4, 1); f
-             1/90*pi^4
diff --git a/debian/patches/version-temp-singular-4-extra-fixes.patch b/debian/patches/version-temp-singular-4-extra-fixes.patch
index bd153de..499417b 100644
--- a/debian/patches/version-temp-singular-4-extra-fixes.patch
+++ b/debian/patches/version-temp-singular-4-extra-fixes.patch
@@ -8,7 +8,7 @@ Forwarded: TODO, to Sage
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/bin/sage
 +++ b/sage/src/bin/sage
-@@ -467,7 +467,7 @@
+@@ -472,7 +472,7 @@
  
  if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
      shift

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