[sagenb] 02/03: Refresh patches

Ximin Luo infinity0 at debian.org
Tue Jun 13 18:44:25 UTC 2017


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

infinity0 pushed a commit to branch master
in repository sagenb.

commit bae5c7e6da2fbb0fbba5ad13925f238e304f97fd
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jun 13 19:58:59 2017 +0200

    Refresh patches
---
 debian/changelog                                   |   6 +
 debian/patches/debian-jmol-paths.patch             |  18 +--
 debian/patches/debian-python-paths.patch           |   2 +-
 debian/patches/disable-farbtastic-jpicker.patch    |  22 ++--
 ...witch-system-jquery-vanderlee-colorpicker.patch |   2 +-
 debian/patches/update-flask-0.11.patch             | 145 ++++++---------------
 debian/patches/use-system-jquery.patch             |   4 +-
 7 files changed, 71 insertions(+), 128 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d07785f..58a5682 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sagenb (1.0.1+ds1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Ximin Luo <infinity0 at debian.org>  Tue, 13 Jun 2017 19:44:33 +0200
+
 sagenb (0.13+ds1-2) unstable; urgency=medium
 
   * Update plot3d warning message to mention the existence of the tachyon and
diff --git a/debian/patches/debian-jmol-paths.patch b/debian/patches/debian-jmol-paths.patch
index 288c2a8..3e373c0 100644
--- a/debian/patches/debian-jmol-paths.patch
+++ b/debian/patches/debian-jmol-paths.patch
@@ -21,23 +21,23 @@ Forwarded: not-needed
          script: "",
 --- a/sagenb/flask_version/base.py
 +++ b/sagenb/flask_version/base.py
-@@ -36,12 +36,10 @@
+@@ -39,12 +39,10 @@
          self.add_static_path('/javascript', DATA)
          self.add_static_path('/static', DATA)
          self.add_static_path('/java', DATA)
--        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jmol"))
--        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol"))
--        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","js"))
--        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
--        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
--        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s","core"))
+-        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_SHARE"],"jmol"))
+-        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_SHARE"],"jsmol"))
+-        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_SHARE"],"jsmol","js"))
+-        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s"))
+-        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s"))
+-        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s","core"))
 +        self.add_static_path('/java/jmol', os.path.join("/usr","share","jmol"))
 +        self.add_static_path('/java/jmol-applet', os.path.join("/usr","share","jmol-applet"))
 +        self.add_static_path('/jsmol', os.path.join("/usr","share","jsmol"))
 +        self.add_static_path('/j2s', os.path.join("/usr","share","jsmol","j2s"))
+         self.add_static_path('/threejs', os.path.join(os.environ["SAGE_SHARE"],"threejs"))
          import mimetypes
          mimetypes.add_type('text/plain','.jmol')
- 
 --- a/sagenb/data/sage/html/notebook/base.html
 +++ b/sagenb/data/sage/html/notebook/base.html
 @@ -136,12 +136,6 @@
@@ -55,7 +55,7 @@ Forwarded: not-needed
      </div>
 --- a/sagenb/notebook/cell.py
 +++ b/sagenb/notebook/cell.py
-@@ -2359,6 +2359,9 @@
+@@ -2393,6 +2393,9 @@
          script_name = os.path.join(self.url_to_self(), F)
          return textwrap.dedent("""
          <div id="sage_jmol_{id}" class="3DPlotDiv">
diff --git a/debian/patches/debian-python-paths.patch b/debian/patches/debian-python-paths.patch
index defce56..48f9638 100644
--- a/debian/patches/debian-python-paths.patch
+++ b/debian/patches/debian-python-paths.patch
@@ -3,7 +3,7 @@ Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
 --- a/sagenb/notebook/notebook.py
 +++ b/sagenb/notebook/notebook.py
-@@ -639,10 +639,9 @@
+@@ -646,10 +646,9 @@
          else:
              import random
              user_at_host = random.choice(server_pool)
diff --git a/debian/patches/disable-farbtastic-jpicker.patch b/debian/patches/disable-farbtastic-jpicker.patch
index 3da6fd1..e2c50ce 100644
--- a/debian/patches/disable-farbtastic-jpicker.patch
+++ b/debian/patches/disable-farbtastic-jpicker.patch
@@ -3,7 +3,7 @@ Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
 --- a/sagenb/notebook/interact.py
 +++ b/sagenb/notebook/interact.py
-@@ -448,8 +448,8 @@
+@@ -449,8 +449,8 @@
        a 6-character HTML hexadecimal string.
  
      - ``widget`` - a string (default: 'colorpicker'); the color
@@ -14,7 +14,7 @@ Forwarded: not-needed
  
      - ``hide_box`` - a boolean (default: False); whether to hide the
        input box associated with the color selector widget
-@@ -462,53 +462,13 @@
+@@ -463,53 +463,13 @@
  
          sage: sagenb.notebook.interact.html_color_selector(0, 'alert("changed")', '', default='0afcac')
          '...<table>...colorpicker...'
@@ -69,7 +69,7 @@ Forwarded: not-needed
  
      elif widget == 'colorpicker':
          # HTML
-@@ -572,72 +532,7 @@
+@@ -573,72 +533,7 @@
               </script>""" % (default, id, id, id, default, default, change)
  
      elif widget == 'jpicker':
@@ -143,7 +143,7 @@ Forwarded: not-needed
  
      return s
  
-@@ -2387,8 +2282,8 @@
+@@ -2388,8 +2283,8 @@
  
      * ``u = color_selector(default=(0,0,1), label=None,
        widget='colorpicker', hide_box=False)`` - a color selector with a
@@ -154,7 +154,7 @@ Forwarded: not-needed
  
      * ``u = text_control(value='')`` - a block of text
  
-@@ -2885,8 +2780,8 @@
+@@ -2886,8 +2781,8 @@
            the left of the selector.
  
          - ``widget`` - a string (default: 'colorpicker'); the color
@@ -165,7 +165,7 @@ Forwarded: not-needed
  
          - ``hide_box`` - a boolean (default: False); whether to hide
            the input box associated with the color selector widget
-@@ -2895,8 +2790,6 @@
+@@ -2896,8 +2791,6 @@
  
              sage: color_selector()
              Interact color selector labeled None, with default RGB color (0.0, 0.0, 1.0), widget 'colorpicker', and visible input box
@@ -174,7 +174,7 @@ Forwarded: not-needed
              sage: color_selector(default = Color(0, 0.5, 0.25))
              Interact color selector labeled None, with default RGB color (0.0, 0.5, 0.25), widget 'colorpicker', and visible input box
              sage: color_selector('purple', widget = 'colorpicker')
-@@ -2905,12 +2798,6 @@
+@@ -2906,12 +2799,6 @@
              Traceback (most recent call last):
              ...
              ValueError: unknown color 'crayon'
@@ -187,7 +187,7 @@ Forwarded: not-needed
          """
          input_box.__init__(self, default=Color(default), label=label,
                             type=Color, widget=widget, hide_box=hide_box)
-@@ -2929,8 +2816,6 @@
+@@ -2930,8 +2817,6 @@
  
              sage: color_selector(Color('red'), 'line color').__repr__()
              "Interact color selector labeled 'line color', with default RGB color (1.0, 0.0, 0.0), widget 'colorpicker', and visible input box"
@@ -196,7 +196,7 @@ Forwarded: not-needed
          """
          s = "Interact color selector labeled %r, with default %r, widget %r, and " % (self.label(), self.default(), self.widget())
          if self.hide_box():
-@@ -2950,10 +2835,6 @@
+@@ -2951,10 +2836,6 @@
  
              sage: color_selector().widget()
              'colorpicker'
@@ -207,7 +207,7 @@ Forwarded: not-needed
              sage: color_selector(default=Color(0,0.5,0.25)).widget()
              'colorpicker'
          """
-@@ -2972,8 +2853,6 @@
+@@ -2973,8 +2854,6 @@
  
              sage: color_selector().hide_box()
              False
@@ -248,7 +248,7 @@ Forwarded: not-needed
  {% block page_id %}notebook-settings-page{% endblock %}
 --- a/sagenb/notebook/conf.py
 +++ b/sagenb/notebook/conf.py
-@@ -213,7 +213,6 @@
+@@ -210,7 +210,6 @@
  
                      if DS[o][TYPE] == T_COLOR:
                          s += u'        <div id="picker_%s"></div>\n' % color_picker
diff --git a/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch b/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch
index cf783a7..dd55638 100644
--- a/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch
+++ b/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 
 --- a/sagenb/notebook/interact.py
 +++ b/sagenb/notebook/interact.py
-@@ -483,53 +483,44 @@
+@@ -484,53 +484,44 @@
                    <input type="text"
                           id="%s"
                           name="color"
diff --git a/debian/patches/update-flask-0.11.patch b/debian/patches/update-flask-0.11.patch
index 9d8d573..17712af 100644
--- a/debian/patches/update-flask-0.11.patch
+++ b/debian/patches/update-flask-0.11.patch
@@ -5,49 +5,29 @@ Forwarded: TODO
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sagenb/flask_version/admin.py
 +++ b/sagenb/flask_version/admin.py
-@@ -1,10 +1,10 @@
+@@ -1,7 +1,7 @@
  import os
--from flask import Module, url_for, render_template, request, session, redirect, g, current_app
-+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
- from decorators import login_required, admin_required, with_lock
+ from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
+ from .decorators import login_required, admin_required, with_lock
 -from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
 +from flask_babel import Babel, gettext, ngettext, lazy_gettext
  _ = gettext
  
--admin = Module('sagenb.flask_version.admin')
-+admin = Blueprint('admin', 'sagenb.flask_version.admin')
- 
- @admin.route('/users')
- @admin.route('/users/reset/<reset>')
+ admin = Blueprint('admin', 'sagenb.flask_version.admin')
 --- a/sagenb/flask_version/authentication.py
 +++ b/sagenb/flask_version/authentication.py
-@@ -1,11 +1,11 @@
- import os
+@@ -2,7 +2,7 @@
  import random
--from flask import Module, url_for, render_template, request, session, redirect, g, current_app
-+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
- from decorators import with_lock
+ from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
+ from .decorators import with_lock
 -from flask.ext.babel import gettext, ngettext, lazy_gettext
 +from flask_babel import gettext, ngettext, lazy_gettext
  _ = gettext
  
--authentication = Module('sagenb.flask_version.authentication')
-+authentication = Blueprint('authentication', 'sagenb.flask_version.authentication')
- 
- ##################
- # Authentication #
+ authentication = Blueprint('authentication',
 --- a/sagenb/flask_version/base.py
 +++ b/sagenb/flask_version/base.py
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python
- import os, time, re
- from functools import partial
--from flask import Flask, Module, url_for, request, session, redirect, g, make_response, current_app, render_template
-+from flask import Flask, Blueprint, url_for, request, session, redirect, g, make_response, current_app, render_template
- from decorators import login_required, guest_or_login_required, with_lock
- from decorators import global_lock
- # Make flask use the old session foo from <=flask-0.9
-@@ -11,7 +11,7 @@
+@@ -14,7 +14,7 @@
  from sage.env import SAGE_SRC, SAGE_DOC
  SRC = os.path.join(SAGE_SRC, 'sage')
  from flask.ext.openid import OpenID
@@ -56,16 +36,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  from sagenb.misc.misc import SAGENB_ROOT, DATA, translations_path, N_, nN_, unicode_str
  from json import dumps
  from sagenb.notebook.cell import number_of_rows
-@@ -83,7 +83,7 @@
-         return render_template(os.path.join('html', 'error_message.html'),
-                                **template_dict)
- 
--base = Module('sagenb.flask_version.base')
-+base = Blueprint('base', 'sagenb.flask_version.base')
- 
- #############
- # Main Page #
-@@ -443,6 +443,7 @@
+@@ -447,6 +447,7 @@
      #this function must be modified to add per user language support
      @babel.localeselector
      def get_locale():
@@ -75,50 +46,30 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      ########################
 --- a/sagenb/flask_version/doc.py
 +++ b/sagenb/flask_version/doc.py
-@@ -14,13 +14,13 @@
- 
- """
- import os
--from flask import Module, url_for, render_template, request, session, redirect, g, current_app
-+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
- from decorators import login_required, guest_or_login_required
+@@ -18,7 +18,7 @@
+ from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
+ from .decorators import login_required, guest_or_login_required
  
 -from flask.ext.babel import gettext, ngettext, lazy_gettext
 +from flask_babel import gettext, ngettext, lazy_gettext
  _ = gettext
  
--doc = Module('sagenb.flask_version.doc')
-+doc = Blueprint('doc', 'sagenb.flask_version.doc')
- 
- from sage.env import SAGE_DOC
- DOC = os.path.join(SAGE_DOC, 'html', 'en')
+ doc = Blueprint('doc', 'sagenb.flask_version.doc')
 --- a/sagenb/flask_version/settings.py
 +++ b/sagenb/flask_version/settings.py
-@@ -1,12 +1,12 @@
- import os
+@@ -2,7 +2,7 @@
  import random
--from flask import Module, url_for, render_template, request, session, redirect, g, current_app
-+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
- from decorators import login_required, with_lock
+ from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
+ from .decorators import login_required, with_lock
 -from flask.ext.babel import gettext, ngettext, lazy_gettext
 +from flask_babel import gettext, ngettext, lazy_gettext
  _ = gettext
  
  
--settings = Module('sagenb.flask_version.settings')
-+settings = Blueprint('settings', 'sagenb.flask_version.settings')
- 
- @settings.route('/settings', methods = ['GET','POST'])
- @login_required
 --- a/sagenb/flask_version/worksheet.py
 +++ b/sagenb/flask_version/worksheet.py
-@@ -1,17 +1,17 @@
- import re
- import os, threading, collections
- from functools import wraps
--from flask import Module, make_response, url_for, render_template, request, session, redirect, g, current_app
-+from flask import Blueprint, make_response, url_for, render_template, request, session, redirect, g, current_app
- from decorators import login_required, with_lock
+@@ -8,7 +8,7 @@
+ from .decorators import login_required, with_lock
  from collections import defaultdict
  from werkzeug.utils import secure_filename
 -from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
@@ -126,14 +77,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  _ = gettext
  
  from sagenb.notebook.interact import INTERACT_UPDATE_PREFIX
- from sagenb.notebook.misc import encode_response
- 
--ws = Module('sagenb.flask_version.worksheet')
-+ws = Blueprint('worksheet', 'sagenb.flask_version.worksheet')
- worksheet_locks = defaultdict(threading.Lock)
- 
- def worksheet_view(f):
-@@ -664,7 +664,7 @@
+@@ -667,7 +667,7 @@
      this URI to get one or more base64-encoded data files.
      """
      # Defaults taken from upstream jsmol.php
@@ -142,7 +86,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          "http://cactus.nci.nih.gov/chemical/structure/ethanol/file?format=sdf&get3d=True")
      call = request.values.get('call', u'getRawDataFromDatabase')
      database = request.values.get('database', '_')
-@@ -673,11 +673,11 @@
+@@ -676,11 +676,11 @@
      current_app.logger.debug('JSmol call:  %s', call)
      current_app.logger.debug('JSmol query: %s', query)
      if encoding == None:
@@ -158,22 +102,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      else:
 --- a/sagenb/flask_version/worksheet_listing.py
 +++ b/sagenb/flask_version/worksheet_listing.py
-@@ -2,12 +2,12 @@
- """
- import os
+@@ -5,7 +5,7 @@
  import urllib, urlparse
--from flask import Module, url_for, render_template, request, session, redirect, g, current_app
-+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
- from decorators import login_required, guest_or_login_required, with_lock
+ from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
+ from .decorators import login_required, guest_or_login_required, with_lock
 -from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
 +from flask_babel import Babel, gettext, ngettext, lazy_gettext
  _ = gettext
  
--worksheet_listing = Module('sagenb.flask_version.worksheet_listing')
-+worksheet_listing = Blueprint('worksheet_listing', 'sagenb.flask_version.worksheet_listing')
- 
- def render_worksheet_list(args, pub, username):
-     """
+ worksheet_listing = Blueprint('worksheet_listing',
 --- a/sagenb/flask_version/decorators.py
 +++ b/sagenb/flask_version/decorators.py
 @@ -1,6 +1,6 @@
@@ -186,8 +123,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  from threading import Lock
 --- a/sagenb/notebook/challenge.py
 +++ b/sagenb/notebook/challenge.py
-@@ -27,7 +27,7 @@
- import os, random, re, urllib2, urllib
+@@ -32,7 +32,7 @@
+ from six.moves.urllib.request import urlopen, Request
  
  from sagenb.notebook.template import template
 -from flask.ext.babel import gettext, lazy_gettext
@@ -197,7 +134,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  class ChallengeResponse(object):
 --- a/sagenb/notebook/conf.py
 +++ b/sagenb/notebook/conf.py
-@@ -9,7 +9,7 @@
+@@ -10,7 +10,7 @@
  #  The full text of the GPL is available at:
  #                  http://www.gnu.org/licenses/
  #############################################################################
@@ -208,10 +145,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  DESC = 'desc'
 --- a/sagenb/notebook/notebook.py
 +++ b/sagenb/notebook/notebook.py
-@@ -45,7 +45,7 @@
+@@ -51,7 +51,7 @@
  from . import user_conf    # user configuration
  from . import user         # users
- from   template import template, prettify_time_ago
+ from   .template import template, prettify_time_ago
 -from flask.ext.babel import gettext, lazy_gettext
 +from flask_babel import gettext, lazy_gettext
  
@@ -231,8 +168,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sagenb/notebook/server_conf.py
 +++ b/sagenb/notebook/server_conf.py
 @@ -8,7 +8,7 @@
- from conf import (POS, DESC, GROUP, TYPE, CHOICES, T_BOOL, T_INTEGER,
-                   T_CHOICE, T_REAL, T_COLOR, T_STRING, T_LIST, T_INFO)
+ from .conf import (POS, DESC, GROUP, TYPE, CHOICES, T_BOOL, T_INTEGER,
+                    T_CHOICE, T_REAL, T_COLOR, T_STRING, T_LIST, T_INFO)
  from sagenb.misc.misc import get_languages, N_
 -from flask.ext.babel import gettext, lazy_gettext
 +from flask_babel import gettext, lazy_gettext
@@ -241,7 +178,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  defaults = {'word_wrap_cols':72,
 --- a/sagenb/notebook/template.py
 +++ b/sagenb/notebook/template.py
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  import os, re, sys
  
  from sagenb.misc.misc import SAGE_VERSION, DATA
@@ -249,7 +186,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +from flask_babel import gettext, ngettext, lazy_gettext
  from flask import current_app as app
  
- if os.environ.has_key('SAGENB_TEMPLATE_PATH'):
+ if 'SAGENB_TEMPLATE_PATH' in os.environ:
 --- a/sagenb/notebook/tutorial.py
 +++ b/sagenb/notebook/tutorial.py
 @@ -348,7 +348,7 @@
@@ -263,9 +200,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      (_('Find Help and Documentation'),
 --- a/sagenb/notebook/user_conf.py
 +++ b/sagenb/notebook/user_conf.py
-@@ -7,7 +7,7 @@
- from conf import (Configuration, POS, DESC, GROUP, TYPE, CHOICES, T_BOOL,
-                   T_INTEGER, T_CHOICE, T_REAL, T_COLOR, T_STRING, T_LIST)
+@@ -8,7 +8,7 @@
+ from .conf import (Configuration, POS, DESC, GROUP, TYPE, CHOICES, T_BOOL,
+                    T_INTEGER, T_CHOICE, T_REAL, T_COLOR, T_STRING, T_LIST)
  from sagenb.misc.misc import SAGENB_ROOT, get_languages
 -from flask.ext.babel import lazy_gettext
 +from flask_babel import lazy_gettext
@@ -274,16 +211,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              'default_system':'sage',
 --- a/sagenb/notebook/worksheet.py
 +++ b/sagenb/notebook/worksheet.py
-@@ -56,7 +56,7 @@
+@@ -57,7 +57,7 @@
  # Imports specifically relevant to the sage notebook
- from cell import Cell, TextCell
- from template import template, clean_name, prettify_time_ago
+ from .cell import Cell, TextCell
+ from .template import template, clean_name, prettify_time_ago
 -from flask.ext.babel import gettext, lazy_gettext
 +from flask_babel import gettext, lazy_gettext
  _ = gettext
  
  # Set some constants that will be used for regular expressions below.
-@@ -4405,7 +4405,7 @@
+@@ -4527,7 +4527,7 @@
      Converts ``t`` (in Unix time) to a locale-specific string
      describing the time and date.
      """
diff --git a/debian/patches/use-system-jquery.patch b/debian/patches/use-system-jquery.patch
index 1e7c4a3..4f23267 100644
--- a/debian/patches/use-system-jquery.patch
+++ b/debian/patches/use-system-jquery.patch
@@ -58,7 +58,7 @@ Forwarded: not-needed
  <script type="text/javascript">
 --- a/sagenb/testing/HTMLTestRunner.py
 +++ b/sagenb/testing/HTMLTestRunner.py
-@@ -462,7 +462,7 @@
+@@ -465,7 +465,7 @@
          template_dict['stylesheet'] += IE_STYLE_FIX.render()
  
          jquery = open(os.path.join(DATA,
@@ -67,7 +67,7 @@ Forwarded: not-needed
          template_dict['javascript'] = '<script type="text/javascript">\n' + jquery + '\n</script>'
          return template(os.path.join('html', 'test_report.html'),
                          **template_dict)
-@@ -495,7 +495,7 @@
+@@ -498,7 +498,7 @@
          elif status == _TestResult.FAIL:
              status = 'fail'
          else:

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



More information about the debian-science-commits mailing list