[sagemath] 01/01: Do patch path to Jmol but always look in /usr instead of SAGE_LOCAL

[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 5fdef31e43a8af6c5505f3945c97e92f005f04da
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sun Dec 4 11:54:30 2016 +0100

    Do patch path to Jmol but always look in /usr instead of SAGE_LOCAL
---
 debian/patches/debian-paths.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/patches/debian-paths.patch b/debian/patches/debian-paths.patch
index 504f1d8..8442077 100644
--- a/debian/patches/debian-paths.patch
+++ b/debian/patches/debian-paths.patch
@@ -317,3 +317,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  def degseq_to_data(degree_sequence):
      """
+--- a/sage/src/sage/interfaces/jmoldata.py
++++ b/sage/src/sage/interfaces/jmoldata.py
+@@ -148,7 +148,7 @@
+             True
+         """
+         # Set up paths, file names and scripts
+-        jmolpath = os.path.join(SAGE_LOCAL, "share", "jmol", "JmolData.jar")
++        jmolpath = os.path.join("/usr", "share", "jmol", "JmolData.jar")
+         target_native = targetfile
+         import sys
+         if sys.platform == 'cygwin':

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