← Back to team overview

yade-dev team mailing list archive

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

 

The following commit has been merged in the master branch:
commit 37fc33159989d7cdd2ad184b51b49a72a950831d
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Thu Apr 5 21:44:36 2012 +0200

    Minor fixes in ipython-0.12 patch.

diff --git a/debian/patches/fix_ipython_0.12.patch b/debian/patches/fix_ipython_0.12.patch
index be1f6dc..6aceb28 100644
--- a/debian/patches/fix_ipython_0.12.patch
+++ b/debian/patches/fix_ipython_0.12.patch
@@ -14,7 +14,8 @@ Last-Update: 2012-04-03
  		from IPython.frontend.terminal.embed import InteractiveShellEmbed
  		# use the dict to set attributes
  		for k in ipconfig: setattr(InteractiveShellEmbed,k,ipconfig[k])
- 		InteractiveShellEmbed.banner1=banner # called banner1 here, not banner anymore
+-		InteractiveShellEmbed.banner1=banner # called banner1 here, not banner anymore
++		InteractiveShellEmbed.banner1=banner+'\n' # called banner1 here, not banner anymore
  		ipshell=InteractiveShellEmbed()
  		ipshell()
 -		# similar to the workaround, as for 0.10 (perhaps not needed?)

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