[Python-modules-commits] r6785 - in packages/ipython/trunk/debian (4 files)

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

    Date: Wednesday, October 29, 2008 @ 10:58:13
  Author: speijnik-guest
Revision: 6785

Added debian/patches/06_ipythonwx_importerror.patch. Added recommend for global (needed by ipy_gnuglobal IPython extension).

Added:
  packages/ipython/trunk/debian/patches/06_ipythonwx_importerror.patch
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/control
  packages/ipython/trunk/debian/patches/series

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2008-10-29 10:34:12 UTC (rev 6784)
+++ packages/ipython/trunk/debian/changelog	2008-10-29 10:58:13 UTC (rev 6785)
@@ -11,13 +11,17 @@
   * Moved from dpatch to quilt.
   * Added dependency on python-foolscap.
   * Wrote manpage for ipcluster, ipengine and ipcontroller.
+  * Added recommend for global (needed by ipy_gnuglobal IPython extension).
+  * Added debian/patches/06_ipythonwx_importerror.patch.
+    + Provides more usable error message when trying to execute ipython-wx
+    + without python-wxgtk2.8 installed.
   * UNRELEASED - WORK IN PROGRESS.
   
   [ Serafeim Zanikolas ]
   * Remove embedded copy of jquery.js and instead depend on libjs-jquery.
   * Fix import of path in ipipe.py (Closes: #486923).
 
- -- Stephan Peijnik <debian at sp.or.at>  Tue, 28 Oct 2008 23:22:04 +0100
+ -- Stephan Peijnik <debian at sp.or.at>  Wed, 29 Oct 2008 11:56:22 +0100
 
 ipython (0.8.4-1) unstable; urgency=low
 

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2008-10-29 10:34:12 UTC (rev 6784)
+++ packages/ipython/trunk/debian/control	2008-10-29 10:58:13 UTC (rev 6785)
@@ -17,7 +17,7 @@
 Conflicts: python2.3-ipython, python2.4-ipython, ipython-common
 Replaces: python2.3-ipython, python2.4-ipython, ipython-common
 Suggests: python-profiler, python-numpy, python-matplotlib
-Recommends: python-wxwidgets2.8, 
+Recommends: python-wxwidgets2.8, global
 Description: enhanced interactive Python shell
  IPython can be used as a replacement for the standard Python shell,
  or it can be used as a complete working environment for scientific

Added: packages/ipython/trunk/debian/patches/06_ipythonwx_importerror.patch
===================================================================
--- packages/ipython/trunk/debian/patches/06_ipythonwx_importerror.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/06_ipythonwx_importerror.patch	2008-10-29 10:58:13 UTC (rev 6785)
@@ -0,0 +1,17 @@
+Author: Stephan Peijnik
+Comment:
+  Added more usable error message when exiting due to python-wxgtk2.8 not being
+  installed.
+
+--- ipython-0.9.1.orig/IPython/frontend/wx/ipythonx.py	2008-10-29 11:50:42.777153341 +0100
++++ ipython-0.9.1/IPython/frontend/wx/ipythonx.py	2008-10-29 11:52:10.136154913 +0100
+@@ -9,6 +9,9 @@
+     e.message = """%s
+ ________________________________________________________________________________
+ You need wxPython to run this application.
++
++wxPython can be installed from the python-wxgtk2.8 package. This can be
++done by running 'apt-get install python-wxgtk2.8'.
+ """ % e.message
+     e.args = (e.message, ) + e.args[1:]
+     raise e

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2008-10-29 10:34:12 UTC (rev 6784)
+++ packages/ipython/trunk/debian/patches/series	2008-10-29 10:58:13 UTC (rev 6785)
@@ -1,3 +1,4 @@
 03_ipy_gnuglobal.patch
 04_remove_shebang.patch
 05_fix_seteditor_example.patch
+06_ipythonwx_importerror.patch