r38700 - in /packages/fenics/dolfin/trunk/debian: changelog patches/pytrilinos.patch patches/series

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

Author: johannr-guest
Date: Tue Aug 16 09:46:19 2011
New Revision: 38700

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38700
Log:
Add patch for fixing problem with import order of PyTrilinos and dolfin.

Added:
    packages/fenics/dolfin/trunk/debian/patches/pytrilinos.patch
Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/patches/series

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=38700&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Tue Aug 16 09:46:19 2011
@@ -7,6 +7,7 @@
   * debian/control:
     - Add libboost-iostreams-dev to Build-Depends and to Depends in -dev
       package.
+  * Add patch for importing PyTrilinos before dolfin (closes: #631589).
 
  -- Johannes Ring <johannr at simula.no>  Mon, 15 Aug 2011 17:36:44 +0200
 

Added: packages/fenics/dolfin/trunk/debian/patches/pytrilinos.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/pytrilinos.patch?rev=38700&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/pytrilinos.patch (added)
+++ packages/fenics/dolfin/trunk/debian/patches/pytrilinos.patch Tue Aug 16 09:46:19 2011
@@ -1,0 +1,16 @@
+Fix problem with import when DOLFIN is built with Trilinos and MPI.
+
+--- dolfin-1.0-beta.orig/site-packages/dolfin/__init__.py	2011-08-16 11:34:47.000000000 +0200
++++ dolfin-1.0-beta/site-packages/dolfin/__init__.py	2011-08-16 11:37:18.000000000 +0200
+@@ -1,5 +1,11 @@
+ """Main module for DOLFIN"""
+ 
++# Try importing PyTrilinos first
++try:
++    import PyTrilinos
++except:
++    pass
++
+ # Special module to handle import issues
+ import dolfin.importhandler
+ 

Modified: packages/fenics/dolfin/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/series?rev=38700&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/series (original)
+++ packages/fenics/dolfin/trunk/debian/patches/series Tue Aug 16 09:46:19 2011
@@ -1,1 +1,2 @@
 build.patch
+pytrilinos.patch