[Python-modules-commits] r16813 - in packages/pebl/trunk/debian (4 files)

[yoh at users.alioth.debian.org]

    Date: Friday, April 29, 2011 @ 01:11:39
  Author: yoh
Revision: 16813

Added patch up_safe_ipython1_import + changelog note on medium urgency

Added:
  packages/pebl/trunk/debian/patches/
  packages/pebl/trunk/debian/patches/series
  packages/pebl/trunk/debian/patches/up_safe_ipython1_import
Modified:
  packages/pebl/trunk/debian/changelog

Modified: packages/pebl/trunk/debian/changelog
===================================================================
--- packages/pebl/trunk/debian/changelog	2011-04-29 01:11:25 UTC (rev 16812)
+++ packages/pebl/trunk/debian/changelog	2011-04-29 01:11:39 UTC (rev 16813)
@@ -1,5 +1,7 @@
 pebl (1.0.2-2) unstable; urgency=medium
 
+  * Upload with medium emergency to allow binNMU'ed nipy transition into
+    wheezy
   * debian/control:
     - Vcs headers
     - Slight tune ups in the descriptions
@@ -8,7 +10,9 @@
     - Unconditionally provide --install-layout=deb
     - Point PYTHONPATH to the built version while invoking sphinx-build
     - Use inplace sid operation for tuning up shebang in /usr/bin/pebl
-    
+  * Added patch up_safe_ipython1_import to allow documentation to build
+    without ipython1 module being available
+
  -- Yaroslav Halchenko <debian at onerussian.com>  Thu, 28 Apr 2011 16:55:59 -0400
 
 pebl (1.0.2-1) unstable; urgency=low

Added: packages/pebl/trunk/debian/patches/series
===================================================================
--- packages/pebl/trunk/debian/patches/series	                        (rev 0)
+++ packages/pebl/trunk/debian/patches/series	2011-04-29 01:11:39 UTC (rev 16813)
@@ -0,0 +1 @@
+up_safe_ipython1_import

Added: packages/pebl/trunk/debian/patches/up_safe_ipython1_import
===================================================================
--- packages/pebl/trunk/debian/patches/up_safe_ipython1_import	                        (rev 0)
+++ packages/pebl/trunk/debian/patches/up_safe_ipython1_import	2011-04-29 01:11:39 UTC (rev 16813)
@@ -0,0 +1,19 @@
+From: Yaroslav Halchenko <debian at onerussian.com>
+Subject: Safeguard import of ipython1 to enable building of the documentation with sphinx
+Vendor: Debian
+
+--- a/src/pebl/taskcontroller/ec2ipy1.py
++++ b/src/pebl/taskcontroller/ec2ipy1.py
+@@ -2,7 +2,11 @@ import sys, os, time
+ import ConfigParser
+ from itertools import groupby
+ 
+-import ipython1.kernel.api as kernel
++try:
++    import ipython1.kernel.api as kernel
++except ImportError:
++    kernel = False
++
+ import boto
+ 
+ # options required in the config file