[pkg-boost-commits] r14469 - in boost/trunk/debian: . patches
Steven Michael Robbins
smr at alioth.debian.org
Wed Aug 26 03:10:12 UTC 2009
Author: smr
Date: 2009-08-26 03:10:12 +0000 (Wed, 26 Aug 2009)
New Revision: 14469
Added:
boost/trunk/debian/patches/function-template.patch
Modified:
boost/trunk/debian/changelog
boost/trunk/debian/control
boost/trunk/debian/patches/series
Log:
Add conflict for system-dev. Reinstate function-template.patch.
Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2009-08-25 06:00:57 UTC (rev 14468)
+++ boost/trunk/debian/changelog 2009-08-26 03:10:12 UTC (rev 14469)
@@ -1,3 +1,13 @@
+boost1.39 (1.39.0-2) unstable; urgency=low
+
+ * control: libboost-system1.39-dev must conflict with
+ libboost-system1.38-dev. Closes: #543522.
+
+ * patches/function-template.patch: Re-instated, since patch did not make
+ it to this release of Boost. Closes: #543576.
+
+ -- Steve M. Robbins <smr at debian.org> Tue, 25 Aug 2009 22:09:07 -0500
+
boost1.39 (1.39.0-1) unstable; urgency=low
* New upstream. Closes: #533822.
Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control 2009-08-25 06:00:57 UTC (rev 14468)
+++ boost/trunk/debian/control 2009-08-26 03:10:12 UTC (rev 14469)
@@ -3,7 +3,7 @@
Section: libs
Priority: optional
Maintainer: Debian Boost Team <pkg-boost-devel at lists.alioth.debian.org>
-Uploaders: Steve M. Robbins <smr at debian.org>, Domenico Andreoli <cavok at debian.org>, Christophe Prud'homme <prudhomm at debian.org>
+Uploaders: Steve M. Robbins <smr at debian.org>, Domenico Andreoli <cavok at debian.org>
Build-Depends: debhelper (>= 7), quilt, bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6), mpi-default-dev
Build-Conflicts: boost-build, libopenmpi-dev (= 1.3.2-2)
XS-Python-Version: 2.4, 2.5
@@ -440,6 +440,7 @@
Architecture: any
Section: libdevel
Depends: libboost1.39-dev (= ${binary:Version}), libboost-system1.39.0 (= ${binary:Version})
+Conflicts: libboost-system1.38-dev
Description: Operating system (e.g. diagnostics support) library
This package forms part of the Boost C++ Libraries collection.
.
Added: boost/trunk/debian/patches/function-template.patch
===================================================================
--- boost/trunk/debian/patches/function-template.patch (rev 0)
+++ boost/trunk/debian/patches/function-template.patch 2009-08-26 03:10:12 UTC (rev 14469)
@@ -0,0 +1,16 @@
+Reported upstream as https://svn.boost.org/trac/boost/ticket/2469
+
+--- boost1.37-1.37.0.orig/boost/function/function_template.hpp
++++ boost1.37-1.37.0/boost/function/function_template.hpp
+@@ -950,10 +950,10 @@
+ f.vtable->manager(f.functor, this->functor,
+ boost::detail::function::move_functor_tag);
+ f.vtable = 0;
+-#if !defined(BOOST_NO_EXCEPTIONS)
+ } else {
+ clear();
+ }
++#if !defined(BOOST_NO_EXCEPTIONS)
+ } catch (...) {
+ vtable = 0;
+ throw;
Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series 2009-08-25 06:00:57 UTC (rev 14468)
+++ boost/trunk/debian/patches/series 2009-08-26 03:10:12 UTC (rev 14469)
@@ -10,3 +10,4 @@
jam-wall-clean.patch
boost_python_translate_exception.patch
wave-cpp.patch
+function-template.patch
\ No newline at end of file
More information about the pkg-boost-commits
mailing list