[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. debian/0.80.1-1-2-g852fb42

Anton Gladky gladky.anton at gmail.com
Wed Jul 4 19:42:08 UTC 2012


The following commit has been merged in the master branch:
commit 9ddf3c41d6ed882fda07731563ad05b30fdac952
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Jul 4 21:34:18 2012 +0200

    Handle ipython 0.13. (Closes: #680285)

diff --git a/debian/patches/fix_ipython_0.13.patch b/debian/patches/fix_ipython_0.13.patch
new file mode 100644
index 0000000..d5b633d
--- /dev/null
+++ b/debian/patches/fix_ipython_0.13.patch
@@ -0,0 +1,17 @@
+Description: Fix FTBFS due to ipython 0.13
+Author: Anton Gladky <gladky.anton at gmail.com>
+Bug-Debian: http://bugs.debian.org/680285
+Applied-Upstrem: https://github.com/yade/trunk/commit/394fe30ff6a9968500f2d51694534827dec29611
+Last-Update: 2012-07-04
+
+--- 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,12): # versions that we are able to handle, round up or down correspondingly
++if ipython_version not in (10,11,12,13): # 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
diff --git a/debian/patches/series b/debian/patches/series
index 5d77ab5..a53725c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 get_rid_off_suffix.patch
 fix_FTBFS_on_KFreeBSD.patch
 fix_ftbfs-gcc-4.7.patch
+fix_ipython_0.13.patch

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



More information about the debian-science-commits mailing list