diff -Nru ufc-2.0.3/ChangeLog ufc-2.0.5/ChangeLog --- ufc-2.0.3/ChangeLog 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/ChangeLog 2011-12-07 11:46:40.000000000 +0000 @@ -1,3 +1,8 @@ +2.0.5 [2011-12-07] + - Improve configuration of libboost-math +2.0.4 [2011-11-28] + - Add boost_math_tr1 to library flags when JIT compiling an + extension module 2.0.3 [2011-10-26] - CMake config improvements 2.0.2 [2011-08-11] diff -Nru ufc-2.0.3/CMakeLists.txt ufc-2.0.5/CMakeLists.txt --- ufc-2.0.3/CMakeLists.txt 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/CMakeLists.txt 2011-12-07 11:46:40.000000000 +0000 @@ -9,7 +9,7 @@ project(UFC) set(UFC_VERSION_MAJOR "2") set(UFC_VERSION_MINOR "0") -set(UFC_VERSION_MICRO "3") +set(UFC_VERSION_MICRO "5") set(UFC_VERSION_STRING "${UFC_VERSION_MAJOR}.${UFC_VERSION_MINOR}.${UFC_VERSION_MICRO}") # Set special link option, see `cmake --help-policy CMP0003` diff -Nru ufc-2.0.3/debian/changelog ufc-2.0.5/debian/changelog --- ufc-2.0.3/debian/changelog 2011-10-26 15:42:51.000000000 +0000 +++ ufc-2.0.5/debian/changelog 2011-12-07 12:07:47.000000000 +0000 @@ -1,3 +1,15 @@ +ufc (2.0.5-1) unstable; urgency=low + + * New upstream release. + + -- Johannes Ring Wed, 07 Dec 2011 12:55:13 +0100 + +ufc (2.0.4-1) unstable; urgency=low + + * New upstream release. + + -- Johannes Ring Mon, 28 Nov 2011 22:40:05 +0100 + ufc (2.0.3-1) unstable; urgency=low * New upstream release. diff -Nru ufc-2.0.3/debian/control ufc-2.0.5/debian/control --- ufc-2.0.3/debian/control 2011-10-26 15:42:51.000000000 +0000 +++ ufc-2.0.5/debian/control 2011-12-07 12:07:47.000000000 +0000 @@ -11,7 +11,7 @@ libboost-dev Standards-Version: 3.9.2 X-Python-Version: >= 2.5 -Homepage: http://www.fenicsproject.org +Homepage: http://fenicsproject.org DM-Upload-Allowed: yes Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/fenics/ufc/trunk Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/fenics/ufc/trunk/ diff -Nru ufc-2.0.3/README ufc-2.0.5/README --- ufc-2.0.3/README 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/README 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -UFC 2.0.3 +UFC 2.0.5 --------- Contents: diff -Nru ufc-2.0.3/src/ufc/ufc.h ufc-2.0.5/src/ufc/ufc.h --- ufc-2.0.3/src/ufc/ufc.h 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/ufc/ufc.h 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -// This is UFC (Unified Form-assembly Code) v. 2.0.2. +// This is UFC (Unified Form-assembly Code) v. 2.0.5. // This code is released into the public domain. // // The FEniCS Project (http://www.fenicsproject.org/) 2006-2011. @@ -8,11 +8,11 @@ #define UFC_VERSION_MAJOR 2 #define UFC_VERSION_MINOR 0 -#define UFC_VERSION_MAINTENANCE 3 +#define UFC_VERSION_MAINTENANCE 5 #include -const char UFC_VERSION[] = "2.0.2"; +const char UFC_VERSION[] = "2.0.5"; namespace ufc { diff -Nru ufc-2.0.3/src/utils/python/ufc_benchmark/ufc_benchmark.cpp ufc-2.0.5/src/utils/python/ufc_benchmark/ufc_benchmark.cpp --- ufc-2.0.3/src/utils/python/ufc_benchmark/ufc_benchmark.cpp 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_benchmark/ufc_benchmark.cpp 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -// This is utility code for UFC (Unified Form-assembly Code) v. 2.0.3. +// This is utility code for UFC (Unified Form-assembly Code) v. 2.0.5. // This code is released into the public domain. // // The FEniCS Project (http://www.fenicsproject.org/) 2006-2011. diff -Nru ufc-2.0.3/src/utils/python/ufc_benchmark/ufc_benchmark.h ufc-2.0.5/src/utils/python/ufc_benchmark/ufc_benchmark.h --- ufc-2.0.3/src/utils/python/ufc_benchmark/ufc_benchmark.h 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_benchmark/ufc_benchmark.h 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -// This is utility code for UFC (Unified Form-assembly Code) v 2.0.3. +// This is utility code for UFC (Unified Form-assembly Code) v 2.0.5. // This code is released into the public domain. // // The FEniCS Project (http://www.fenicsproject.org/) 2006-2011. diff -Nru ufc-2.0.3/src/utils/python/ufc_benchmark/ufc_data.h ufc-2.0.5/src/utils/python/ufc_benchmark/ufc_data.h --- ufc-2.0.3/src/utils/python/ufc_benchmark/ufc_data.h 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_benchmark/ufc_data.h 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -// This is utility code for UFC (Unified Form-assembly Code) v 2.0.3. +// This is utility code for UFC (Unified Form-assembly Code) v 2.0.5. // This code is released into the public domain. // // The FEniCS Project (http://www.fenicsproject.org/) 2006-2011. diff -Nru ufc-2.0.3/src/utils/python/ufc_benchmark/ufc_reference_cell.h ufc-2.0.5/src/utils/python/ufc_benchmark/ufc_reference_cell.h --- ufc-2.0.3/src/utils/python/ufc_benchmark/ufc_reference_cell.h 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_benchmark/ufc_reference_cell.h 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -// This is utility code for UFC (Unified Form-assembly Code) v 2.0.3. +// This is utility code for UFC (Unified Form-assembly Code) v 2.0.5. // This code is released into the public domain. // // The FEniCS Project (http://www.fenicsproject.org/) 2006-2011. diff -Nru ufc-2.0.3/src/utils/python/ufc_utils/build.py ufc-2.0.5/src/utils/python/ufc_utils/build.py --- ufc-2.0.3/src/utils/python/ufc_utils/build.py 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_utils/build.py 2011-12-07 11:46:40.000000000 +0000 @@ -1,5 +1,5 @@ __author__ = "Johan Hake (hake@simula.no)" -__date__ = "2009-03-06 -- 2011-03-05" +__date__ = "2009-03-06 -- 2011-12-06" __copyright__ = "Copyright (C) 2009 Johan Hake" __license__ = "GNU LGPL Version 2.1" @@ -8,7 +8,7 @@ # Modified by Martin Alnes, 2009 import instant -import os, sys, re +import os, sys, re, glob from distutils import sysconfig @@ -57,14 +57,17 @@ declarations = extract_declarations(h_files2) # Check system requirements - (cpp_path, swig_include_dirs) = configure_instant(swig_binary, swig_path) - + (cpp_path, swig_include_dirs, library_dirs, libraries) = \ + configure_instant(swig_binary, swig_path) + # Call instant and return module return instant.build_module(wrap_headers = h_files, source_directory = source_directory, additional_declarations = declarations, system_headers = system_headers, include_dirs = cpp_path, + library_dirs = library_dirs, + libraries = libraries, swigargs = ['-c++', '-I.','-O'], swig_include_dirs = swig_include_dirs, **kwargs) @@ -125,15 +128,35 @@ break if not boost_is_found: - raise OSError, """The Boost library was not found. + raise OSError, """The Boost headers was not found. If Boost is installed in a nonstandard location, set the environment variable BOOST_DIR. """ - + # Add the boost_include_dir cpp_path += boost_include_dir - - return cpp_path, swig_include_dirs + + # Check for boost_math library + # FIXME: This is a hack and should be done properly, probably using + # FIXME: cmake --find-packages + # If BOOST_DIR is not set use default directory + boost_dir = os.getenv("BOOST_DIR", default) + boost_math_is_found = False + for lib_dir in ["", "lib64", "lib"]: + for math_lib in ["-mt", ""]: + if glob.glob(os.path.join(boost_dir, lib_dir, \ + "libboost_math_tr1%s*"%math_lib)): + boost_library_dir = [os.path.join(boost_dir, lib_dir)] + boost_math_is_found = True + boost_library = ["boost_math_tr1%s"%math_lib] + break + + if not boost_math_is_found: + raise OSError, """The Boost math library was not found. +If Boost math library is installed in a nonstandard location, +set the environment variable BOOST_DIR. +""" + return cpp_path, swig_include_dirs, boost_library_dir, boost_library def extract_declarations(h_files): "Extract information for shared_ptr" diff -Nru ufc-2.0.3/src/utils/python/ufc_utils/dofmap.py ufc-2.0.5/src/utils/python/ufc_utils/dofmap.py --- ufc-2.0.3/src/utils/python/ufc_utils/dofmap.py 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_utils/dofmap.py 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.3. +# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.5. # This code is released into the public domain. # # The FEniCS Project (http://www.fenicsproject.org/) 2006-2011. diff -Nru ufc-2.0.3/src/utils/python/ufc_utils/finite_element.py ufc-2.0.5/src/utils/python/ufc_utils/finite_element.py --- ufc-2.0.3/src/utils/python/ufc_utils/finite_element.py 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_utils/finite_element.py 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.3. +# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.5. # This code is released into the public domain. # # The FEniCS Project (http://www.fenicsproject.org/) 2006-2011. diff -Nru ufc-2.0.3/src/utils/python/ufc_utils/form.py ufc-2.0.5/src/utils/python/ufc_utils/form.py --- ufc-2.0.3/src/utils/python/ufc_utils/form.py 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_utils/form.py 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.3. +# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.5. # This code is released into the public domain. # # The FEniCS Project (http://www.fenicsproject.org/) 2006-2011. diff -Nru ufc-2.0.3/src/utils/python/ufc_utils/function.py ufc-2.0.5/src/utils/python/ufc_utils/function.py --- ufc-2.0.3/src/utils/python/ufc_utils/function.py 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_utils/function.py 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.3. +# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.5. # This code is released into the public domain. # # The FEniCS Project (http://www.fenicsproject.org/) 2006-2011. diff -Nru ufc-2.0.3/src/utils/python/ufc_utils/__init__.py ufc-2.0.5/src/utils/python/ufc_utils/__init__.py --- ufc-2.0.3/src/utils/python/ufc_utils/__init__.py 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_utils/__init__.py 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -"""Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.2. +"""Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.5. Three format strings are defined for each of the following UFC classes: @@ -30,12 +30,12 @@ # -*- coding: utf-8 -*- __author__ = "Martin Sandve Alnaes, Anders Logg, Kent-Andre Mardal, Ola Skavhaug, and Hans Petter Langtangen" __date__ = "2011-02-21" -__version__ = "2.0.3" +__version__ = "2.0.5" __license__ = "This code is released into the public domain" UFC_VERSION_MAJOR = 2 UFC_VERSION_MINOR = 0 -UFC_VERSION_MAINTENANCE = 3 +UFC_VERSION_MAINTENANCE = 5 UFC_VERSION = __version__ diff -Nru ufc-2.0.3/src/utils/python/ufc_utils/integrals.py ufc-2.0.5/src/utils/python/ufc_utils/integrals.py --- ufc-2.0.3/src/utils/python/ufc_utils/integrals.py 2011-10-26 15:10:19.000000000 +0000 +++ ufc-2.0.5/src/utils/python/ufc_utils/integrals.py 2011-12-07 11:46:40.000000000 +0000 @@ -1,4 +1,4 @@ -# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.3. +# Code generation format strings for UFC (Unified Form-assembly Code) v. 2.0.5. # This code is released into the public domain. # # The FEniCS Project (http://www.fenicsproject.org/) 2006-2011.