diff -Nru boost1.58-1.58.0+dfsg/debian/changelog boost1.58-1.58.0+dfsg/debian/changelog --- boost1.58-1.58.0+dfsg/debian/changelog 2015-08-02 18:32:34.000000000 +0200 +++ boost1.58-1.58.0+dfsg/debian/changelog 2015-10-03 19:59:54.000000000 +0200 @@ -1,3 +1,10 @@ +boost1.58 (1.58.0+dfsg-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS of ompl against boost1.58 by gcc5. (Closes: #797281) + + -- Anton Gladky Sat, 03 Oct 2015 19:58:02 +0200 + boost1.58 (1.58.0+dfsg-3) unstable; urgency=medium * Upload to unstable. diff -Nru boost1.58-1.58.0+dfsg/debian/patches/numeric-ublas-storage.hpp.patch boost1.58-1.58.0+dfsg/debian/patches/numeric-ublas-storage.hpp.patch --- boost1.58-1.58.0+dfsg/debian/patches/numeric-ublas-storage.hpp.patch 1970-01-01 01:00:00.000000000 +0100 +++ boost1.58-1.58.0+dfsg/debian/patches/numeric-ublas-storage.hpp.patch 2015-10-03 20:00:06.000000000 +0200 @@ -0,0 +1,38 @@ +Description: "template inline" instead of "inline template" + Fix FTBFS of ompl against boost1.58 by gcc5. +Author: v4hn +Origin: https://github.com/v4hn/ublas/commit/78eecc8bbf035c01316647839be4094748f8e77d + https://svn.boost.org/trac/boost/attachment/ticket/11207/patch_numeric-ublas-storage.hpp.diff +Bug-Debian: https://bugs.debian.org/797281 +Bug-Debian: https://bugs.debian.org/799819 +Reviewed-By: Anton Gladky +Last-Update: 2015-10-03 + +--- boost1.58-1.58.0+dfsg.orig/boost/numeric/ublas/storage.hpp ++++ boost1.58-1.58.0+dfsg/boost/numeric/ublas/storage.hpp +@@ -777,8 +777,8 @@ namespace boost { namespace numeric { na + BOOST_UBLAS_INLINE + shallow_array_adaptor (size_type size, pointer data): + size_ (size), own_ (false), data_ (data, leaker ()) {} +- BOOST_UBLAS_INLINE + template ++ BOOST_UBLAS_INLINE + shallow_array_adaptor (T (&data)[N]): + size_ (N), own_ (false), data_ (data, leaker ()) {} + +@@ -833,13 +833,13 @@ namespace boost { namespace numeric { na + void resize (size_type size, pointer data, value_type init) { + resize_internal (size, data, init, true); + } +- BOOST_UBLAS_INLINE + template ++ BOOST_UBLAS_INLINE + void resize (T (&data)[N]) { + resize_internal (N, data, value_type (), false); + } +- BOOST_UBLAS_INLINE + template ++ BOOST_UBLAS_INLINE + void resize (T (&data)[N], value_type init) { + resize_internal (N, data, init, true); + } diff -Nru boost1.58-1.58.0+dfsg/debian/patches/series boost1.58-1.58.0+dfsg/debian/patches/series --- boost1.58-1.58.0+dfsg/debian/patches/series 2015-07-25 16:26:24.000000000 +0200 +++ boost1.58-1.58.0+dfsg/debian/patches/series 2015-10-03 19:55:21.000000000 +0200 @@ -10,3 +10,4 @@ 0002-Fix-a-regression-with-non-constexpr-types.patch ec60c37295146bb80aa44a92cf416027b75b5ff7.patch boost-context-use-sysv-not-aapcs.patch +numeric-ublas-storage.hpp.patch