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

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

    Date: Saturday, November 12, 2011 @ 18:08:16
  Author: jtaylor-guest
Revision: 19293

update patch for debian specific error messages

Added:
  packages/ipython/trunk/debian/patches/debianize-error-messages.patch
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/series
Deleted:
  packages/ipython/trunk/debian/patches/improve-error-message-on-missing-ipython-qtconsole.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2011-11-12 18:08:06 UTC (rev 19292)
+++ packages/ipython/trunk/debian/changelog	2011-11-12 18:08:16 UTC (rev 19293)
@@ -1,6 +1,7 @@
 ipython (0.11~rc4-1) experimental; urgency=low
 
   * New upstream release candidate
+  * update patch for debian specific error messages
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 19 Jul 2011 12:15:23 +0200
 

Added: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2011-11-12 18:08:16 UTC (rev 19293)
@@ -0,0 +1,38 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Thu, 7 Jul 2011 18:19:04 +0200
+Subject: debianize error messages
+Forwarded: not-needed
+
+Index: trunk/IPython/scripts/ipython
+===================================================================
+--- trunk.orig/IPython/scripts/ipython	2011-07-19 12:10:40.916829075 +0200
++++ trunk/IPython/scripts/ipython	2011-07-19 12:11:06.836829059 +0200
+@@ -4,4 +4,8 @@
+ 
+ from IPython.frontend.terminal.ipapp import launch_new_instance
+ 
+-launch_new_instance()
++try:
++  launch_new_instance()
++except ImportError as e:
++  if "qt.console.qtconsoleapp" in e.message:
++    print "Could not start qtconsole. Please install ipython-qtconsole"
+Index: trunk/IPython/zmq/__init__.py
+===================================================================
+--- trunk.orig/IPython/zmq/__init__.py	2011-07-19 12:11:20.136829049 +0200
++++ trunk/IPython/zmq/__init__.py	2011-07-19 12:12:00.956829023 +0200
+@@ -16,12 +16,12 @@
+ try:
+     import zmq
+ except ImportError:
+-    raise ImportError("IPython.zmq requires pyzmq >= %s"%minimum_pyzmq_version)
++    raise ImportError("IPython.zmq requires python-zmq >= %s"%minimum_pyzmq_version)
+ 
+ pyzmq_version = zmq.__version__
+ 
+ if pyzmq_version < minimum_pyzmq_version:
+-    raise ImportError("IPython.zmq requires pyzmq >= %s, but you have %s"%(
++    raise ImportError("IPython.zmq requires python-zmq >= %s, but you have %s"%(
+                     minimum_pyzmq_version, pyzmq_version))
+ 
+ del pyzmq_version

Deleted: packages/ipython/trunk/debian/patches/improve-error-message-on-missing-ipython-qtconsole.patch
===================================================================
--- packages/ipython/trunk/debian/patches/improve-error-message-on-missing-ipython-qtconsole.patch	2011-11-12 18:08:06 UTC (rev 19292)
+++ packages/ipython/trunk/debian/patches/improve-error-message-on-missing-ipython-qtconsole.patch	2011-11-12 18:08:16 UTC (rev 19293)
@@ -1,23 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Thu, 7 Jul 2011 18:19:04 +0200
-Subject: improve error message on missing ipython-qtconsole
-
----
- IPython/scripts/ipython |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/IPython/scripts/ipython b/IPython/scripts/ipython
-index 20095a8..e8019e4 100755
---- a/IPython/scripts/ipython
-+++ b/IPython/scripts/ipython
-@@ -7,4 +7,8 @@ entry points."""
- 
- from IPython.frontend.terminal.ipapp import launch_new_instance
- 
--launch_new_instance()
-+try:
-+  launch_new_instance()
-+except ImportError as e:
-+  if "qt.console.qtconsoleapp" in e.message:
-+    print "Could not start qtconsole. Please install ipython-qtconsole"
--- 

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2011-11-12 18:08:06 UTC (rev 19292)
+++ packages/ipython/trunk/debian/patches/series	2011-11-12 18:08:16 UTC (rev 19293)
@@ -1,3 +1,3 @@
-improve-error-message-on-missing-ipython-qtconsole.patch
+debianize-error-messages.patch
 05_fix_seteditor_example.patch
 07_use_lightbg.patch