diff -Nru boost1.42-1.42.0/debian/changelog boost1.42-1.42.0/debian/changelog --- boost1.42-1.42.0/debian/changelog 2010-10-20 21:15:01.000000000 +0000 +++ boost1.42-1.42.0/debian/changelog 2010-10-22 13:06:13.000000000 +0000 @@ -1,20 +1,8 @@ -boost1.42 (1.42.0-4ubuntu2) natty; urgency=low +boost1.42 (1.42.0-4lucid1) lucid; urgency=low - * patches/gcc4.5-fixes.patch: - - Add patch from SVN r61647 to fix compilation problems with gcc 4.5 + * backport to lucid; no source changes - -- Andrew Mitchell Wed, 20 Oct 2010 15:00:10 +1300 - -boost1.42 (1.42.0-4ubuntu1) natty; urgency=low - - * Merge from debian unstable. Remaining changes: - - Detect gcc atomic intrinsics, needed for arm spinlock (LP: 513721) - - Drop libboost-mpi, libboost-mip-python, and libboost-graph-parallel (and - related -dev packages): we don't want to pull all of the mpi packages - into main. - - Adjust debian/rules and debian/control - - -- Scott Kitterman Tue, 12 Oct 2010 21:10:14 -0400 + -- Philipp Edelmann Fri, 22 Oct 2010 15:05:55 +0200 boost1.42 (1.42.0-4) unstable; urgency=low @@ -36,17 +24,6 @@ -- Steve M. Robbins Sun, 25 Jul 2010 22:26:18 -0500 -boost1.42 (1.42.0-3ubuntu1) maverick; urgency=low - - * Merge from Debian Unstable (based on boost1.40). Ubuntu changes: - - Detect gcc atomic intrinsics, needed for arm spinlock (LP: 513721) - - Drop libboost-mpi, libboost-mip-python, and libboost-graph-parallel (and - related -dev packages): nothing uses thess, and we don't want to pull all - of the mpi packages into main. - - Adjust debian/rules and debian/control - - -- Scott Kitterman Thu, 06 May 2010 22:54:04 -0400 - boost1.42 (1.42.0-3) unstable; urgency=low * rules: Add test_exec_monitor. Closes: #539350. (Previous upload was @@ -1603,4 +1580,3 @@ * First upstream version. -- Raphael Bossek Mon, 12 Mar 2001 23:37:49 +0100 - diff -Nru boost1.42-1.42.0/debian/control boost1.42-1.42.0/debian/control --- boost1.42-1.42.0/debian/control 2010-07-27 17:39:27.000000000 +0000 +++ boost1.42-1.42.0/debian/control 2010-07-26 03:19:06.000000000 +0000 @@ -2,10 +2,9 @@ Homepage: http://www.boost.org/ Section: libs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Boost Team +Maintainer: Debian Boost Team Uploaders: Steve M. Robbins , Domenico Andreoli -Build-Depends: debhelper (>= 7), bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6) +Build-Depends: debhelper (>= 7), 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 Vcs-Browser: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/ @@ -38,9 +37,11 @@ Suggests: libboost1.42-doc, libboost-date-time1.42-dev, libboost-filesystem1.42-dev, + libboost-graph-parallel1.42-dev, libboost-graph1.42-dev, libboost-iostreams1.42-dev, libboost-math1.42-dev, + libboost-mpi1.42-dev, libboost-program-options1.42-dev, libboost-python1.42-dev, libboost-regex1.42-dev, @@ -68,8 +69,11 @@ libboost-date-time1.40-dev (<= 1.40.0-2), libboost-filesystem1.40-dev (<= 1.40.0-2), libboost-graph1.40-dev (<= 1.40.0-2), + libboost-graph-parallel1.40-dev (<= 1.40.0-2), libboost-iostreams1.40-dev (<= 1.40.0-2), libboost-math1.40-dev (<= 1.40.0-2), + libboost-mpi1.40-dev (<= 1.40.0-2), + libboost-mpi-python1.40-dev (<= 1.40.0-2), libboost-program-options1.40-dev (<= 1.40.0-2), libboost-python1.40-dev (<= 1.40.0-2), libboost-regex1.40-dev (<= 1.40.0-2), @@ -94,7 +98,7 @@ boostbook and quickbook. . For the following subprojects separate packages exist: date-time, - filesystem, graph, iostreams, math, program_options, python, + filesystem, graph, iostreams, math, mpi, program_options, python, regex, serialization, signals, system, test, thread, and wave. Package: libboost1.42-all-dev @@ -105,8 +109,11 @@ libboost-date-time1.42-dev, libboost-filesystem1.42-dev, libboost-graph1.42-dev, + libboost-graph-parallel1.42-dev, libboost-iostreams1.42-dev, libboost-math1.42-dev, + libboost-mpi1.42-dev, + libboost-mpi-python1.42-dev, libboost-program-options1.42-dev, libboost-python1.42-dev, libboost-regex1.42-dev, @@ -263,6 +270,43 @@ standardized generic interface for traversing graphs is of utmost importance to encourage reuse of graph algorithms and data structures. +Package: libboost-graph-parallel1.42.0 +Homepage: http://www.boost.org/libs/graph_parallel/ +Architecture: any +Section: libs +Depends: ${misc:Depends}, ${shlibs:Depends} +Suggests: graphviz +Description: generic graph components and algorithms in C++ + This package forms part of the Boost C++ Libraries collection. + . + The Parallel Boost Graph Library is an extension to the Boost Graph Library + (BGL) for parallel and distributed computing. It offers distributed graphs + and graph algorithms to exploit coarse-grained parallelism along with + parallel algorithms that exploit fine-grained parallelism, while retaining + the same interfaces as the (sequential) BGL. Code written using the sequential + BGL should be easy to parallelize with the parallel BGL. + +Package: libboost-graph-parallel1.42-dev +Homepage: http://www.boost.org/libs/graph_parallel/ +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + libboost1.42-dev (= ${binary:Version}), + libboost-serialization1.42-dev (= ${binary:Version}), + libboost-test1.42-dev (= ${binary:Version}) +Conflicts: libboost-graph-parallel1.40-dev, + libboost-graph-parallel1.41-dev +Recommends: libboost-graph-parallel1.42.0 (= ${binary:Version}) +Description: generic graph components and algorithms in C++ + This package forms part of the Boost C++ Libraries collection. + . + The Parallel Boost Graph Library is an extension to the Boost Graph Library + (BGL) for parallel and distributed computing. It offers distributed graphs + and graph algorithms to exploit coarse-grained parallelism along with + parallel algorithms that exploit fine-grained parallelism, while retaining + the same interfaces as the (sequential) BGL. Code written using the sequential + BGL should be easy to parallelize with the parallel BGL. + Package: libboost-iostreams1.42.0 Homepage: http://www.boost.org/libs/iostreams/ Architecture: any @@ -341,6 +385,82 @@ * Implementation Toolkit: Provides many of the tools required to implement mathematical special functions. +Package: libboost-mpi1.42.0 +Homepage: http://www.boost.org/doc/html/mpi.html +Architecture: any +Section: libs +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: C++ interface to the Message Passing Interface (MPI) + This package forms part of the Boost C++ Libraries collection. + . + The Boost.MPI library provides a C++ interface to MPI that + supports modern C++ development styles, including complete support for + user-defined data types and C++ Standard Library types, arbitrary function + objects for collective algorithms, and the use of modern C++ library + techniques to maintain maximal efficiency. + +Package: libboost-mpi1.42-dev +Homepage: http://www.boost.org/doc/html/mpi.html +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + libboost1.42-dev (= ${binary:Version}), + libboost-serialization1.42-dev (= ${binary:Version}), + libboost-mpi1.42.0 (= ${binary:Version}), + mpi-default-dev +Suggests: libboost-graph1.42-dev +Conflicts: libboost-mpi1.37-dev, + libboost-mpi1.38-dev, + libboost-mpi1.39-dev, + libboost-mpi1.40-dev, + libboost-mpi1.41-dev +Description: C++ interface to the Message Passing Interface (MPI) + This package forms part of the Boost C++ Libraries collection. + . + The Boost.MPI library provides a C++ interface to MPI that + supports modern C++ development styles, including complete support for + user-defined data types and C++ Standard Library types, arbitrary function + objects for collective algorithms, and the use of modern C++ library + techniques to maintain maximal efficiency. + +Package: libboost-mpi-python1.42.0 +Homepage: http://www.boost.org/doc/html/mpi/python.html +Architecture: any +Section: python +Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends} +Conflicts: libboost-mpi-python1.40.0, + libboost-mpi-python1.41.0 +Description: C++ interface to the Message Passing Interface (MPI), Python Bindings + This package forms part of the Boost C++ Libraries collection. + . + The Boost.MPI library provides a C++ interface to MPI that + supports modern C++ development styles, including complete support for + user-defined data types and C++ Standard Library types, arbitrary function + objects for collective algorithms, and the use of modern C++ library + techniques to maintain maximal efficiency. + . + This package provides Python Bindings to the C++ interface. + +Package: libboost-mpi-python1.42-dev +Homepage: http://www.boost.org/doc/html/mpi/python.html +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + libboost-mpi1.42-dev (= ${binary:Version}), + libboost-mpi-python1.42.0 (= ${binary:Version}) +Conflicts: libboost-mpi-python1.40-dev, + libboost-mpi-python1.41-dev +Description: C++ interface to the Message Passing Interface (MPI), Python Bindings + This package forms part of the Boost C++ Libraries collection. + . + The Boost.MPI library provides a C++ interface to MPI that + supports modern C++ development styles, including complete support for + user-defined data types and C++ Standard Library types, arbitrary function + objects for collective algorithms, and the use of modern C++ library + techniques to maintain maximal efficiency. + . + This package provides Python Bindings to the C++ interface. + Package: libboost-program-options1.42.0 Homepage: http://www.boost.org/libs/program_options/ Architecture: any diff -Nru boost1.42-1.42.0/debian/patches/gcc4.5-fixes.patch boost1.42-1.42.0/debian/patches/gcc4.5-fixes.patch --- boost1.42-1.42.0/debian/patches/gcc4.5-fixes.patch 2010-10-20 21:19:52.000000000 +0000 +++ boost1.42-1.42.0/debian/patches/gcc4.5-fixes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -Description: Qualify arity_helper to avoid it being looked up through ADL. - This patch is applied upstream & allows packages using boost1.42 to build - with gcc 4.5 -Origin: upstream, https://svn.boost.org/trac/boost/changeset/61467 -Bug: https://svn.boost.org/trac/boost/ticket/4061 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/boost1.42/+bug/663624 - -Index: boost1.42-1.42.0/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp -=================================================================== ---- boost1.42-1.42.0.orig/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp (revision 24957) -+++ boost1.42-1.42.0/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp (revision 61467) -@@ -7,9 +7,8 @@ - // - --// Preprocessed version of "boost/mpl/aux_/template_arity.hpp" header -+// *Preprocessed* version of the main "template_arity.hpp" header - // -- DO NOT modify by hand! - - namespace boost { namespace mpl { namespace aux { -- - template< int N > struct arity_tag - { -@@ -24,5 +23,4 @@ - BOOST_STATIC_CONSTANT(int, value = - ( C6 > 0 ? C6 : ( C5 > 0 ? C5 : ( C4 > 0 ? C4 : ( C3 > 0 ? C3 : ( C2 > 0 ? C2 : ( C1 > 0 ? C1 : -1 ) ) ) ) ) ) -- - ); - }; -@@ -84,5 +82,5 @@ - { - BOOST_STATIC_CONSTANT(int, value = -- sizeof(arity_helper(type_wrapper(), arity_tag())) - 1 -+ sizeof(::boost::mpl::aux::arity_helper(type_wrapper(), arity_tag())) - 1 - ); - }; -@@ -93,7 +91,5 @@ - BOOST_STATIC_CONSTANT(int, value = ( - max_arity< template_arity_impl< F,1 >::value, template_arity_impl< F,2 >::value, template_arity_impl< F,3 >::value, template_arity_impl< F,4 >::value, template_arity_impl< F,5 >::value, template_arity_impl< F,6 >::value >::value -- - )); -- - typedef mpl::int_ type; - }; -Index: boost1.42-1.42.0/boost/mpl/aux_/template_arity.hpp -=================================================================== ---- boost1.42-1.42.0.orig/boost/mpl/aux_/template_arity.hpp (revision 49239) -+++ boost1.42-1.42.0/boost/mpl/aux_/template_arity.hpp (revision 61467) -@@ -99,5 +99,5 @@ - { - BOOST_STATIC_CONSTANT(int, value = -- sizeof(arity_helper(type_wrapper(),arity_tag())) - 1 -+ sizeof(::boost::mpl::aux::arity_helper(type_wrapper(),arity_tag())) - 1 - ); - }; diff -Nru boost1.42-1.42.0/debian/patches/gcc-atomic-intrinsics.patch boost1.42-1.42.0/debian/patches/gcc-atomic-intrinsics.patch --- boost1.42-1.42.0/debian/patches/gcc-atomic-intrinsics.patch 2010-05-07 02:43:59.000000000 +0000 +++ boost1.42-1.42.0/debian/patches/gcc-atomic-intrinsics.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Index: boost1.40-1.40.0/boost/smart_ptr/detail/spinlock_gcc_arm.hpp -=================================================================== ---- boost1.40-1.40.0.orig/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 2009-03-02 11:22:16.000000000 -0500 -+++ boost1.40-1.40.0/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 2010-03-27 15:40:14.227864125 -0400 -@@ -29,11 +29,15 @@ - { - int r; - -+#ifdef G_ATOMIC_ARM_USE_GCC_INTRINSICS -+ r = __sync_lock_test_set(&v_, 1); -+#else - __asm__ __volatile__( - "swp %0, %1, [%2]": - "=&r"( r ): // outputs - "r"( 1 ), "r"( &v_ ): // inputs - "memory", "cc" ); -+#endif - - return r == 0; - } diff -Nru boost1.42-1.42.0/debian/patches/series boost1.42-1.42.0/debian/patches/series --- boost1.42-1.42.0/debian/patches/series 2010-10-20 02:00:04.000000000 +0000 +++ boost1.42-1.42.0/debian/patches/series 2010-07-26 03:24:34.000000000 +0000 @@ -12,5 +12,3 @@ kfreebsd-thread.patch lambda-include-deps.patch fusion-name-qual.patch -gcc-atomic-intrinsics.patch -gcc4.5-fixes.patch diff -Nru boost1.42-1.42.0/debian/rtupdate boost1.42-1.42.0/debian/rtupdate --- boost1.42-1.42.0/debian/rtupdate 2010-07-27 17:39:26.000000000 +0000 +++ boost1.42-1.42.0/debian/rtupdate 2009-12-15 04:51:25.000000000 +0000 @@ -14,7 +14,7 @@ suf=$2 cd /usr/lib - for base in libboost_python; do + for base in libboost_python libboost_mpi_python; do target=${base}-${py}.${suf} link=${base}.${suf} test -e $target && ln -s -f $target $link || rm -f $link @@ -27,6 +27,7 @@ cd /usr/lib for thread in "" -mt; do rm -f libboost_python${thread}.${suf} + rm -f libboost_mpi_python${thread}.${suf} done } diff -Nru boost1.42-1.42.0/debian/rules boost1.42-1.42.0/debian/rules --- boost1.42-1.42.0/debian/rules 2010-07-27 17:39:27.000000000 +0000 +++ boost1.42-1.42.0/debian/rules 2010-07-04 06:29:05.000000000 +0000 @@ -14,7 +14,8 @@ SHLIBS_VERSION = (>= 1.42.0-1) # Boost libraries for which we want separate packages -boost_libs := date-time filesystem graph iostreams math \ +boost_libs := date-time filesystem graph-parallel graph iostreams math \ + mpi mpi-python \ program-options python regex serialization signals system test \ thread wave @@ -26,6 +27,7 @@ # These are special cases for suffixes. Generally come from --xpythonid, so begin with a dash. boost_suffixes_python := $(addprefix -py,$(subst .,,$(shell pyversions -rv))) +boost_suffixes_mpi-python := $(boost_suffixes_python) # Files that are generated by filtering a template filtered_files = \ @@ -127,7 +129,6 @@ else ifeq ($(DEB_BUILD_ARCH), arm) BUILD_LONG_DOUBLE = no else ifeq ($(DEB_BUILD_ARCH), armel) -TOOLSET_CONFIG="using gcc : : : -D_REENTRANT -DG_ATOMIC_ARM_USE_GCC_INTRINSICS ;" BUILD_LONG_DOUBLE = no else ifeq ($(DEB_BUILD_ARCH), mips) BUILD_LONG_DOUBLE = no @@ -143,6 +144,8 @@ JAM_OPT += --disable-long-double endif +MPI_CONFIG = "using mpi ;" + exampledir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/examples htmldir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/HTML pyste_prefix = $(CURDIR)/debian/libboost-python$(PKGVERSION)-dev/usr @@ -156,6 +159,7 @@ user-config.jam: echo $(TOOLSET_CONFIG) > $@ + echo $(MPI_CONFIG) >> $@ for pyver in $(filter-out $(shell pyversions -dv),$(shell pyversions -rv)); do \ echo "using python : $$pyver : /usr ;" >> $@; \ done @@ -168,7 +172,8 @@ for pyver in $(shell pyversions -rv); do \ pyid=$$(echo $$pyver | tr -d .); \ echo "Building Boost.Python for python version $pyver"; \ - $(JAM) --with-python --xpythonid=py$$pyid python=$$pyver; \ + $(JAM) --with-python --with-mpi --xpythonid=py$$pyid python=$$pyver; \ + mv stage/lib/mpi.so stage/lib/mpi-py$$pyid.so; \ done cd tools/bcp && $(JAM) @@ -221,14 +226,16 @@ @$(call cp_debhelper,libboost-dev,libboost$(PKGVERSION)-dev) @$(call cp_debhelper,libboost-doc,libboost$(PKGVERSION)-doc) @$(call cp_debhelper,libboost-python-dev,libboost-python$(PKGVERSION)-dev) + @$(call cp_debhelper,libboost-mpi-python-dev,libboost-mpi-python$(PKGVERSION)-dev) $(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --without-python for pyver in $(shell pyversions -rv); do \ pyid=`echo $$pyver | tr -d .`; \ - $(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --xpythonid=py$$pyid python=$$pyver; \ + $(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --xpythonid=py$$pyid python=$$pyver; \ done install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate + install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate find debian/tmp/usr/include -type f | xargs chmod 644 find debian/tmp -name .cvsignore | xargs rm -f @@ -271,6 +278,18 @@ find $(exampledir) -type f | xargs chmod 644 + + # package libboost-mpi-python$(SOVERSION) + dh_install -plibboost-mpi-python$(SOVERSION) + for pyver in $(shell pyversions -rv); do \ + pyid=`echo $$pyver | tr -d .`; \ + dh_install -plibboost-mpi-python$(SOVERSION) libs/mpi/build/__init__.py usr/lib/python$$pyver/site-packages/boost; \ + dh_installdirs -plibboost-mpi-python$(SOVERSION) usr/lib/python$$pyver/site-packages/boost; \ + cp stage/lib/mpi-py$$pyid.so debian/libboost-mpi-python$(SOVERSION)/usr/lib/python$$pyver/site-packages/boost/mpi.so; \ + done + # package libboost-mpi-python$(PKGVERSION)-dev + dh_install -plibboost-python$(PKGVERSION)-dev --autodest \ + debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate # package libboost-python$(PKGVERSION)-dev dh_install -plibboost-python$(PKGVERSION)-dev --autodest \ debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate