[Python-modules-commits] r23604 - in packages/ipython/trunk/debian/patches (6 files)

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

    Date: Tuesday, February 26, 2013 @ 18:07:18
  Author: jtaylor-guest
Revision: 23604

refresh all patches

QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
QUILT_DIFF_OPTS="-p" # for function context

Modified:
  packages/ipython/trunk/debian/patches/ma-python-cython.patch
  packages/ipython/trunk/debian/patches/parallel-2to3.patch
  packages/ipython/trunk/debian/patches/shared-static-path.patch
  packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
  packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch
  packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch

Modified: packages/ipython/trunk/debian/patches/ma-python-cython.patch
===================================================================
--- packages/ipython/trunk/debian/patches/ma-python-cython.patch	2013-02-26 18:07:13 UTC (rev 23603)
+++ packages/ipython/trunk/debian/patches/ma-python-cython.patch	2013-02-26 18:07:18 UTC (rev 23604)
@@ -3,8 +3,6 @@
 Origin: backported from a1daa0286a867cda86e728e177d72a645b72c634
 Author: Julian Taylor <jtaylor.debian at googlemail.com>
 
-diff --git a/IPython/extensions/cythonmagic.py b/IPython/extensions/cythonmagic.py
-index 94f5e9c..0f539d2 100644
 --- a/IPython/extensions/cythonmagic.py
 +++ b/IPython/extensions/cythonmagic.py
 @@ -146,7 +146,18 @@ class CythonMagics(Magics):

Modified: packages/ipython/trunk/debian/patches/parallel-2to3.patch
===================================================================
--- packages/ipython/trunk/debian/patches/parallel-2to3.patch	2013-02-26 18:07:13 UTC (rev 23603)
+++ packages/ipython/trunk/debian/patches/parallel-2to3.patch	2013-02-26 18:07:18 UTC (rev 23604)
@@ -4,7 +4,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -264,6 +264,17 @@
+@@ -265,6 +265,17 @@ if 'setuptools' in sys.modules:
                                    "ipython_win_post_install.py"}}
      
      if PY3:

Modified: packages/ipython/trunk/debian/patches/shared-static-path.patch
===================================================================
--- packages/ipython/trunk/debian/patches/shared-static-path.patch	2013-02-26 18:07:13 UTC (rev 23603)
+++ packages/ipython/trunk/debian/patches/shared-static-path.patch	2013-02-26 18:07:18 UTC (rev 23604)
@@ -5,7 +5,7 @@
 
 --- a/IPython/frontend/html/notebook/notebookapp.py
 +++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -157,7 +157,7 @@
+@@ -157,7 +157,7 @@ class NotebookWebApplication(web.Applica
          
          settings = dict(
              template_path=os.path.join(os.path.dirname(__file__), "templates"),
@@ -14,7 +14,7 @@
              cookie_secret=os.urandom(1024),
              login_url="%s/login"%(base_project_url.rstrip('/')),
          )
-@@ -366,7 +366,7 @@
+@@ -366,7 +366,7 @@ class NotebookApp(BaseIPythonApplication
      def _mathjax_url_default(self):
          if not self.enable_mathjax:
              return u''

Modified: packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch	2013-02-26 18:07:13 UTC (rev 23603)
+++ packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch	2013-02-26 18:07:18 UTC (rev 23604)
@@ -13,7 +13,7 @@
 
 --- a/IPython/core/interactiveshell.py
 +++ b/IPython/core/interactiveshell.py
-@@ -129,7 +129,7 @@
+@@ -123,7 +123,7 @@ def get_default_colors():
      elif os.name=='nt':
          return 'Linux'
      else:

Modified: packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch	2013-02-26 18:07:13 UTC (rev 23603)
+++ packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch	2013-02-26 18:07:18 UTC (rev 23604)
@@ -10,7 +10,7 @@
 
 --- a/docs/examples/core/ipython-qtconsole.desktop
 +++ b/docs/examples/core/ipython-qtconsole.desktop
-@@ -6,7 +6,7 @@
+@@ -6,7 +6,7 @@ Comment=Enhanced interactive Python qtco
  Exec=ipython qtconsole
  GenericName[en_US]=Python shell
  GenericName=Python shell
@@ -21,7 +21,7 @@
  Categories=Development;Utility;
 --- a/docs/examples/core/ipython-sh.desktop
 +++ b/docs/examples/core/ipython-sh.desktop
-@@ -6,7 +6,7 @@
+@@ -6,7 +6,7 @@ Comment=Perform shell-like tasks in inte
  Exec=ipython --profile=pysh
  GenericName[en_US]=IPython shell mode
  GenericName=IPython shell mode
@@ -32,7 +32,7 @@
  Categories=Development;Utility;
 --- a/docs/examples/core/ipython.desktop
 +++ b/docs/examples/core/ipython.desktop
-@@ -6,7 +6,7 @@
+@@ -6,7 +6,7 @@ Comment=Enhanced interactive Python shel
  Exec=ipython
  GenericName[en_US]=IPython
  GenericName=IPython

Modified: packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2013-02-26 18:07:13 UTC (rev 23603)
+++ packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2013-02-26 18:07:18 UTC (rev 23604)
@@ -8,7 +8,7 @@
 
 --- a/IPython/frontend/html/notebook/notebookapp.py
 +++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -150,6 +150,10 @@
+@@ -150,6 +150,10 @@ class NotebookWebApplication(web.Applica
          # Note that the URLs these patterns check against are escaped,
          # and thus guaranteed to be ASCII: 'héllo' is really 'h%C3%A9llo'.
          base_project_url = py3compat.unicode_to_str(base_project_url, 'ascii')
@@ -19,7 +19,7 @@
          
          settings = dict(
              template_path=os.path.join(os.path.dirname(__file__), "templates"),
-@@ -368,6 +372,9 @@
+@@ -368,6 +372,9 @@ class NotebookApp(BaseIPythonApplication
          if os.path.exists(os.path.join(static_path, 'mathjax', "MathJax.js")):
              self.log.info("Using local MathJax")
              return static_url_prefix+u"mathjax/MathJax.js"