[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-9-g7e6eebc

[Radostan Riedel]

The following commit has been merged in the master branch:
commit 7e6eebca995686b8da74584c1c74e3b84d495d40
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Mon Jul 9 20:05:04 2012 +0200

    Adding patch to solve a copilation error what is already solved in upstream trunk

diff --git a/debian/patches/0008-reusing-upstream-trunk-fix-for-gcc4.7-compilation-error.patch b/debian/patches/0008-reusing-upstream-trunk-fix-for-gcc4.7-compilation-error.patch
new file mode 100644
index 0000000..c182580
--- /dev/null
+++ b/debian/patches/0008-reusing-upstream-trunk-fix-for-gcc4.7-compilation-error.patch
@@ -0,0 +1,84 @@
+From: Radostan Riedel <raybuntu at googlemail.com>
+Date: Mon, 9 Jul 2012 19:58:46 +0200
+Subject: reusing upstream trunk fix for gcc4.7 compilation error
+
+---
+ .../scitbx/math/boost_python/distributions.cpp     |   60 +++++++++++++-------
+ 1 file changed, 41 insertions(+), 19 deletions(-)
+
+diff --git a/cctbx_sources/scitbx/math/boost_python/distributions.cpp b/cctbx_sources/scitbx/math/boost_python/distributions.cpp
+index e430cad..3d16a9c 100644
+--- a/cctbx_sources/scitbx/math/boost_python/distributions.cpp
++++ b/cctbx_sources/scitbx/math/boost_python/distributions.cpp
+@@ -75,29 +75,51 @@ namespace {
+   {
+     typedef Distribution wt;
+ 
++    #define NEW_MEMBER(name)                \
++    static FloatType name(wt const &self) { \
++      return boost::math::name(self);                    \
++    }
++
++    NEW_MEMBER(mean);
++    NEW_MEMBER(median);
++    NEW_MEMBER(mode);
++    NEW_MEMBER(variance);
++    NEW_MEMBER(standard_deviation);
++    NEW_MEMBER(skewness);
++    NEW_MEMBER(kurtosis);
++
++    #undef NEW_MEMBER
++
++    #define NEW_MEMBER(name)                               \
++    static FloatType name(wt const &self, FloatType arg) { \
++      return boost::math::name(self, arg);                              \
++    }
++
++    NEW_MEMBER(pdf);
++    NEW_MEMBER(cdf);
++    NEW_MEMBER(quantile);
++
++    #undef NEW_MEMBER
++
++    static scitbx::af::shared<FloatType> quantiles(wt const &self, std::size_t n) {
++      return scitbx::math::quantiles<FloatType>(self, n);
++    }
++
+     static void
+     wrap()
+     {
+       using namespace boost::python;
+-      def("mean", (FloatType(*)(wt const&)) boost::math::mean);
+-      def("median", (FloatType(*)(wt const&)) boost::math::median);
+-      def("mode", (FloatType(*)(wt const&)) boost::math::mode);
+-      def("variance", (FloatType(*)(wt const&)) boost::math::variance);
+-      def("standard_deviation",
+-        (FloatType(*)(wt const&)) boost::math::standard_deviation);
+-      def("skewness", (FloatType(*)(wt const&)) boost::math::skewness);
+-      def("kurtosis", (FloatType(*)(wt const&)) boost::math::kurtosis);
+-      def("pdf", (FloatType(*)(wt const&, FloatType const&)) boost::math::pdf);
+-      def("cdf", (FloatType(*)(wt const&, FloatType const&)) boost::math::cdf);
+-      def("quantile", (FloatType(*)(wt const&, FloatType const&))
+-        boost::math::quantile);
+-      def("quantiles",
+-#if BOOST_WORKAROUND(__EDG_VERSION__, BOOST_TESTED_AT(306))
+-        (scitbx::af::shared<FloatType>(*)(wt const&, std::size_t)) quantiles
+-#else
+-        quantiles<FloatType, wt>
+-#endif
+-        );
++      def("mean"              , mean);
++      def("median"            , median);
++      def("mode"              , mode);
++      def("variance"          , variance);
++      def("standard_deviation", standard_deviation);
++      def("skewness"          , skewness);
++      def("kurtosis"          , kurtosis);
++      def("pdf"               , pdf);
++      def("cdf"               , cdf);
++      def("quantile"          , quantile);
++      def("quantiles"         , quantiles);
+     }
+   };
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 090480a..b8dd01f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-adding-setup_py.patch
 0006-adding-shlib-versioning.patch
 0007-upstream-fix-for-declaration-errors-in-gcc4.7.patch
+0008-reusing-upstream-trunk-fix-for-gcc4.7-compilation-error.patch

-- 
Packaging for cctbx