[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-74-gadfeb7f

Radostan Riedel raybuntu at googlemail.com
Tue Aug 7 19:19:26 UTC 2012


The following commit has been merged in the master branch:
commit 5e78337ae2e3d89ec7d38adc6c3da5a7aab48c0e
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Tue Aug 7 08:25:50 2012 +0200

    Removed unneeded patches for upstreams boost

diff --git a/debian/patches/0004-upstream-fix-for-declaration-errors-in-gcc4.7.patch b/debian/patches/0004-upstream-fix-for-declaration-errors-in-gcc4.7.patch
index ac9de30..a3acee5 100644
--- a/debian/patches/0004-upstream-fix-for-declaration-errors-in-gcc4.7.patch
+++ b/debian/patches/0004-upstream-fix-for-declaration-errors-in-gcc4.7.patch
@@ -3,22 +3,9 @@ Date: Mon, 9 Jul 2012 19:37:49 +0200
 Subject: upstream fix for declaration errors in gcc4.7
 
 ---
- .../math/special_functions/detail/bessel_jy.hpp    |    1 +
- cctbx_sources/mmtbx/bulk_solvent/bulk_solvent.h    |  416 ++++++++++----------
- 2 files changed, 209 insertions(+), 208 deletions(-)
+ cctbx_sources/mmtbx/bulk_solvent/bulk_solvent.h |  416 +++++++++++------------
+ 1 file changed, 208 insertions(+), 208 deletions(-)
 
-diff --git a/cctbx_sources/boost/boost/math/special_functions/detail/bessel_jy.hpp b/cctbx_sources/boost/boost/math/special_functions/detail/bessel_jy.hpp
-index ddedbb7..9812e9f 100644
---- a/cctbx_sources/boost/boost/math/special_functions/detail/bessel_jy.hpp
-+++ b/cctbx_sources/boost/boost/math/special_functions/detail/bessel_jy.hpp
-@@ -17,6 +17,7 @@
- #include <boost/math/special_functions/sin_pi.hpp>
- #include <boost/math/special_functions/cos_pi.hpp>
- #include <boost/math/special_functions/detail/bessel_jy_asym.hpp>
-+#include <boost/math/special_functions/detail/bessel_jy_series.hpp>
- #include <boost/math/constants/constants.hpp>
- #include <boost/math/policies/error_handling.hpp>
- #include <boost/mpl/if.hpp>
 diff --git a/cctbx_sources/mmtbx/bulk_solvent/bulk_solvent.h b/cctbx_sources/mmtbx/bulk_solvent/bulk_solvent.h
 index 6959f18..0be075f 100644
 --- a/cctbx_sources/mmtbx/bulk_solvent/bulk_solvent.h

-- 
Packaging for cctbx



More information about the debian-science-commits mailing list