r47042 - in /packages/fenics/dolfin/trunk/debian: changelog patches/ patches/python2.7.10-fix.patch patches/series

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

Author: johannr-guest
Date: Mon Jun  1 10:25:20 2015
New Revision: 47042

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47042
Log:
Add patch to fix issue with python 2.7.10

Added:
    packages/fenics/dolfin/trunk/debian/patches/
    packages/fenics/dolfin/trunk/debian/patches/python2.7.10-fix.patch
    packages/fenics/dolfin/trunk/debian/patches/series
Modified:
    packages/fenics/dolfin/trunk/debian/changelog

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=47042&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Mon Jun  1 10:25:20 2015
@@ -1,3 +1,9 @@
+dolfin (1.5.0-3) unstable; urgency=medium
+
+  * Add patch to fix issue with Python 2.7.10 (closes: #786857).
+
+ -- Johannes Ring <johannr at simula.no>  Mon, 01 Jun 2015 09:26:07 +0200
+
 dolfin (1.5.0-2) unstable; urgency=medium
 
   * Upload to unstable (closes: #780359).

Added: packages/fenics/dolfin/trunk/debian/patches/python2.7.10-fix.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/python2.7.10-fix.patch?rev=47042&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/python2.7.10-fix.patch	(added)
+++ packages/fenics/dolfin/trunk/debian/patches/python2.7.10-fix.patch	Mon Jun  1 10:25:20 2015
@@ -0,0 +1,18 @@
+From: Johan Hake <hake.dev at gmail.com>
+Subject: Fix issue 525 where the micro and minor part of the python version could not be larger than 9.
+
+Origin: upstream, https://bitbucket.org/fenics-project/dolfin/commits/747e8acefb0f4402cba6444a59391892fd3dd0a7/raw/
+Bug: https://bitbucket.org/fenics-project/dolfin/issue/525
+Bug-Debian: https://bugs.debian.org/786857
+
+diff -Nru dolfin-1.5.0.orig/dolfin/swig/version.i dolfin-1.5.0/dolfin/swig/version.i
+--- dolfin-1.5.0.orig/dolfin/swig/version.i	2015-06-01 09:32:50.511845301 +0200
++++ dolfin-1.5.0/dolfin/swig/version.i	2015-06-01 09:33:30.883883091 +0200
+@@ -33,6 +33,6 @@
+ tmp = hex(dolfin_swigversion())
+ __swigversion__ = "%d.%d.%d"%(tuple(map(int, [tmp[-5], tmp[-3], tmp[-2:]])))
+ tmp = hex(dolfin_pythonversion())
+-__pythonversion__ = "%d.%d.%d"%(tuple(map(int, [tmp[2], tmp[4], tmp[6]])))
++__pythonversion__ = "%d.%d.%d"%(tuple(map(lambda x: int(x,16), [tmp[2], tmp[3:5], tmp[5:7]])))
+ del tmp, dolfin_pythonversion, dolfin_swigversion
+ %}

Added: packages/fenics/dolfin/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/series?rev=47042&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/series	(added)
+++ packages/fenics/dolfin/trunk/debian/patches/series	Mon Jun  1 10:25:20 2015
@@ -0,0 +1 @@
+python2.7.10-fix.patch