[sagemath] 03/05: Move patch hunk to its proper place, fixing a previous bad refresh

[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 a487287a1822e3b880ad243ba6c310173462f263
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Aug 18 16:55:10 2017 +0200

    Move patch hunk to its proper place, fixing a previous bad refresh
---
 debian/patches/u1-fix-atrocious-symlink-logic.patch |  6 ++++--
 debian/patches/u2-allow-override-sage-local.patch   | 11 -----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/patches/u1-fix-atrocious-symlink-logic.patch b/debian/patches/u1-fix-atrocious-symlink-logic.patch
index 00bdf89..8f463c1 100644
--- a/debian/patches/u1-fix-atrocious-symlink-logic.patch
+++ b/debian/patches/u1-fix-atrocious-symlink-logic.patch
@@ -10,7 +10,7 @@ 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
 +++ b/sage/src/sage/repl/ipython_kernel/install.py
-@@ -89,11 +89,19 @@
+@@ -89,12 +89,20 @@
              sage: os.listdir(path)
              ['b']
          """
@@ -23,10 +23,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          except OSError as err:
              if err.errno == errno.EEXIST:
                  return
+-        os.symlink(src, dst)
 +            elif err.errno == errno.ENOENT:
 +                pass
 +            else:
 +                raise
-         os.symlink(src, dst)
++        os.symlink(os.path.relpath(src, os.path.dirname(dst)), dst)
  
      def use_local_mathjax(self):
+         """
diff --git a/debian/patches/u2-allow-override-sage-local.patch b/debian/patches/u2-allow-override-sage-local.patch
index e17f27d..1731214 100644
--- a/debian/patches/u2-allow-override-sage-local.patch
+++ b/debian/patches/u2-allow-override-sage-local.patch
@@ -79,14 +79,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  #---------------------------------------------------------
  AX_CHECK_ROOT([AC_MSG_ERROR([You cannot build Sage as root, switch to an unpriviledged user])], [])
---- a/sage/src/sage/repl/ipython_kernel/install.py
-+++ b/sage/src/sage/repl/ipython_kernel/install.py
-@@ -102,7 +102,7 @@
-                 pass
-             else:
-                 raise
--        os.symlink(src, dst)
-+        os.symlink(os.path.relpath(src, os.path.dirname(dst)), dst)
- 
-     def use_local_mathjax(self):
-         """

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