[Python-modules-commits] r23789 - in packages/ipython/trunk/debian (2 files)

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

    Date: Monday, March 25, 2013 @ 20:04:00
  Author: jtaylor-guest
Revision: 23789

update shared-static-path.patch so nbconvert works with the package

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

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2013-03-24 19:48:03 UTC (rev 23788)
+++ packages/ipython/trunk/debian/changelog	2013-03-25 20:04:00 UTC (rev 23789)
@@ -15,6 +15,7 @@
   * add tkinter package to debianize-error-messages.patch (Closes: #701707)
   * add more autopkgtests testing profile creation and cython magics
   * use canonical vcs fields in control
+  * update shared-static-path.patch so nbconvert works with the package
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 02 Feb 2013 11:14:27 +0100
 

Modified: packages/ipython/trunk/debian/patches/shared-static-path.patch
===================================================================
--- packages/ipython/trunk/debian/patches/shared-static-path.patch	2013-03-24 19:48:03 UTC (rev 23788)
+++ packages/ipython/trunk/debian/patches/shared-static-path.patch	2013-03-25 20:04:00 UTC (rev 23789)
@@ -1,11 +1,22 @@
 Description: use usr/share/ipython/notebook by default for the static data
  provided by ipython-notebook-common
+ also add DEFAULT_STATIC_FILES_PATH as in version 1.0 so nbconvert works
+ with the packaged version (see ipython/nbconvert #97)
 Author: Julian Taylor <jtaylor.debian at googlemail.com>
 Forwarded: not-needed
 
 --- a/IPython/frontend/html/notebook/notebookapp.py
 +++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -157,7 +157,7 @@ class NotebookWebApplication(web.Applica
+@@ -89,6 +89,8 @@ ipython notebook --certfile=mycert.pem #
+ ipython notebook --port=5555 --ip=*    # Listen on port 5555, all interfaces
+ """
+ 
++DEFAULT_STATIC_FILES_PATH = "/usr/share/ipython/notebook/static"
++
+ #-----------------------------------------------------------------------------
+ # Helper functions
+ #-----------------------------------------------------------------------------
+@@ -157,7 +159,7 @@ class NotebookWebApplication(web.Applica
          
          settings = dict(
              template_path=os.path.join(os.path.dirname(__file__), "templates"),
@@ -14,7 +25,7 @@
              cookie_secret=os.urandom(1024),
              login_url="%s/login"%(base_project_url.rstrip('/')),
          )
-@@ -366,7 +366,7 @@ class NotebookApp(BaseIPythonApplication
+@@ -366,7 +368,7 @@ class NotebookApp(BaseIPythonApplication
      def _mathjax_url_default(self):
          if not self.enable_mathjax:
              return u''