[Python-modules-commits] r30183 - in packages/ipython/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Sunday, August 17, 2014 @ 12:20:04
  Author: jtaylor-guest
Revision: 30183

New upstream bugfix release

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/no-submodule-check.patch
  packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2014-08-17 01:35:54 UTC (rev 30182)
+++ packages/ipython/trunk/debian/changelog	2014-08-17 12:20:04 UTC (rev 30183)
@@ -1,3 +1,9 @@
+ipython (2.2.0-1) unstable; urgency=medium
+
+  * New upstream bugfix release
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 17 Aug 2014 13:57:50 +0200
+
 ipython (2.1.0-2) unstable; urgency=medium
 
   * debian/rules: allow building with uglifyjs 2

Modified: packages/ipython/trunk/debian/patches/no-submodule-check.patch
===================================================================
--- packages/ipython/trunk/debian/patches/no-submodule-check.patch	2014-08-17 01:35:54 UTC (rev 30182)
+++ packages/ipython/trunk/debian/patches/no-submodule-check.patch	2014-08-17 12:20:04 UTC (rev 30183)
@@ -1,7 +1,7 @@
 Description: package does not need to check for git submodules
 --- a/IPython/html/notebookapp.py
 +++ b/IPython/html/notebookapp.py
-@@ -735,14 +735,7 @@ class NotebookApp(BaseIPythonApplication
+@@ -761,14 +761,7 @@ class NotebookApp(BaseIPythonApplication
          print(self.notebook_info())
      
      def init_components(self):

Modified: packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2014-08-17 01:35:54 UTC (rev 30182)
+++ packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2014-08-17 12:20:04 UTC (rev 30183)
@@ -4,7 +4,7 @@
 
 --- a/IPython/html/notebookapp.py
 +++ b/IPython/html/notebookapp.py
-@@ -217,6 +217,11 @@ class NotebookWebApplication(web.Applica
+@@ -218,6 +218,11 @@ class NotebookWebApplication(web.Applica
              pattern = url_path_join(settings['base_url'], handler[0])
              new_handler = tuple([pattern] + list(handler[1:]))
              new_handlers.append(new_handler)
@@ -16,7 +16,7 @@
          # add 404 on the end, which will catch everything that falls through
          new_handlers.append((r'(.*)', Template404))
          return new_handlers
-@@ -487,6 +492,10 @@ class NotebookApp(BaseIPythonApplication
+@@ -514,6 +519,10 @@ class NotebookApp(BaseIPythonApplication
                  url = url_path_join(url_prefix, u"mathjax/MathJax.js")
                  self.log.info("Serving local MathJax from %s at %s", mathjax, url)
                  return url
@@ -26,4 +26,4 @@
 +            return u"/mathjax/MathJax.js"
          
          # no local mathjax, serve from CDN
-         if self.certfile:
+         url = u"https://cdn.mathjax.org/mathjax/latest/MathJax.js"