[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.70.0-122-gc554c52

[Anton Gladky]

The following commit has been merged in the master branch:
commit f49fc61a704133c2050007ae051d004702d53f2e
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Apr 4 21:16:48 2012 +0200

    Small fix in ipython-0.12 patch.

diff --git a/debian/patches/fix_ipython_0.12.patch b/debian/patches/fix_ipython_0.12.patch
index 4144ab1..be1f6dc 100644
--- a/debian/patches/fix_ipython_0.12.patch
+++ b/debian/patches/fix_ipython_0.12.patch
@@ -22,11 +22,21 @@ Last-Update: 2012-04-03
  
  ## run userSession in a way corresponding to the features we use:
  gui=None
-@@ -263,5 +261,5 @@
+@@ -262,6 +260,3 @@
+ 	import yade.qt # this yade.qt is different from the one that comes with qt3
  	qapp=QtGui.QApplication(sys.argv)
  	userSession(qt4=True,qapp=qapp)
- 
+-
 -#O.exitNoBacktrace()
 -
-+if yade.runtime.ipython_version>=10:
-+    O.exitNoBacktrace()
+--- a/py/runtime.py
++++ b/py/runtime.py
+@@ -11,7 +11,7 @@
+ except ValueError:
+ 	print 'WARN: unable to extract IPython version from %s, defaulting to 10'%(IPython.__version__)
+ 	ipython_version=10
+-if ipython_version not in (10,11): # versions that we are able to handle, round up or down correspondingly
++if ipython_version not in (10,11,12): # versions that we are able to handle, round up or down correspondingly
+ 	newipver=10 if ipython_version<10 else 11
+ 	print 'WARN: unhandled IPython version 0.%d, assuming 0.%d instead.'%(ipython_version,newipver)
+ 	ipython_version=newipver

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.