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

[Anton Gladky]

The following commit has been merged in the master branch:
commit ef2019295643106fe522f7d1554d6039580d975b
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Dec 19 22:02:59 2011 +0100

    fix FTBFS on with boost >=1.47

diff --git a/debian/patches/fix_boost_1.48_compilation.patch b/debian/patches/fix_boost_1.48_compilation.patch
new file mode 100644
index 0000000..e6f26b5
--- /dev/null
+++ b/debian/patches/fix_boost_1.48_compilation.patch
@@ -0,0 +1,38 @@
+Description: fix FTBFS on with boost >=1.47.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/trunk/revision/2987
+Last-Update: 2011-12-19
+
+--- a/lib/serialization/ObjectIO.hpp
++++ b/lib/serialization/ObjectIO.hpp
+@@ -9,8 +9,12 @@
+ #include<boost/iostreams/filter/gzip.hpp>
+ #include<boost/iostreams/device/file.hpp>
+ #include<boost/algorithm/string.hpp>
+-// local copy
+-#include<boost/math/nonfinite_num_facets.hpp>
++
++#if BOOST_VERSION>=104700
++	#include<boost/math/special_functions/nonfinite_num_facets.hpp>
++#else
++	#include<boost/math/nonfinite_num_facets.hpp>
++#endif
+ 
+ namespace yade{
+ /* Utility template functions for (de)serializing objects using boost::serialization from/to streams or files.
+--- a/py/wrapper/yadeWrapper.cpp
++++ b/py/wrapper/yadeWrapper.cpp
+@@ -47,8 +47,11 @@
+ // #include<yade/pkg/dem/Shop.hpp>
+ #include<yade/pkg/dem/Clump.hpp>
+ 
+-// local copy
+-#include<boost/math/nonfinite_num_facets.hpp>
++#if BOOST_VERSION>=104700
++	#include<boost/math/special_functions/nonfinite_num_facets.hpp>
++#else
++	#include<boost/math/nonfinite_num_facets.hpp>
++#endif
+ 
+ #include<locale>
+ #include<boost/archive/codecvt_null.hpp>
diff --git a/debian/patches/series b/debian/patches/series
index 604bf84..0f8b3b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ get_rid_off_suffix.patch
 fix_vtk-5.8_compilation.patch
 ipython-0.11-migration.patch
 disable_tex_creation.patch
+fix_boost_1.48_compilation.patch

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