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

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

    Date: Tuesday, July 15, 2014 @ 22:07:23
  Author: jtaylor-guest
Revision: 29756

change marked.js search path to folder used by ipython-notebook-common

suggest node and pygments for nbconvert

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/control
  packages/ipython/trunk/debian/patches/shared-static-path.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2014-07-15 22:07:17 UTC (rev 29755)
+++ packages/ipython/trunk/debian/changelog	2014-07-15 22:07:23 UTC (rev 29756)
@@ -2,6 +2,11 @@
 
   * debian/rules: allow building with uglifyjs 2
     Thanks to Leo Iannacone for the patch (Closes: #750715)
+  * shared-static-path.patch: change marked.js search path to path used by
+    ipython-notebook-common package, fixes nbconvert failures when using
+    nodejs instead of pandoc
+  * debian/control: add nodejs to suggests
+    it is an alternative to pandoc for nbconvert to html (Closes: #751008)
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 15 Jul 2014 22:33:25 +0200
 

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2014-07-15 22:07:17 UTC (rev 29755)
+++ packages/ipython/trunk/debian/control	2014-07-15 22:07:23 UTC (rev 29756)
@@ -147,7 +147,7 @@
          libjs-mathjax,
          libjs-underscore,
          ${misc:Depends}
-Suggests: pandoc, pgf
+Suggests: nodejs, pandoc, pgf
 Replaces: ipython-notebook (<< 0.12.1-2)
 Breaks: ipython-notebook (<< 0.12.1-2)
 Description: interactive Python html notebook data package
@@ -171,6 +171,7 @@
          python-zmq (>= 2.1.11),
          ${misc:Depends},
          ${python:Depends}
+Suggests: python-pygments
 Description: interactive Python html notebook
  IPython can be used as a replacement for the standard Python shell,
  or it can be used as a complete working environment for scientific
@@ -193,6 +194,7 @@
          python3-zmq (>= 2.1.11),
          ${misc:Depends},
          ${python3:Depends}
+Suggests: python3-pygments
 Description: interactive Python 3 html notebook
  IPython can be used as a replacement for the standard Python shell,
  or it can be used as a complete working environment for scientific

Modified: packages/ipython/trunk/debian/patches/shared-static-path.patch
===================================================================
--- packages/ipython/trunk/debian/patches/shared-static-path.patch	2014-07-15 22:07:17 UTC (rev 29755)
+++ packages/ipython/trunk/debian/patches/shared-static-path.patch	2014-07-15 22:07:23 UTC (rev 29756)
@@ -21,3 +21,14 @@
 -from .nbextensions import install_nbextension
 \ No newline at end of file
 +from .nbextensions import install_nbextension
+--- a/IPython/nbconvert/filters/marked.js
++++ b/IPython/nbconvert/filters/marked.js
+@@ -3,7 +3,7 @@
+ // that we use in the live notebook.
+ 
+ // IPython static_path dir relative to here:
+-var static_path = __dirname + "/../../html/static/";
++var static_path = "/usr/share/ipython/notebook/static/";
+ 
+ var fs = require('fs');
+ var IPython;