[pkg-boost-commits] r14275 - in boost/trunk/debian: . patches
smr at alioth.debian.org
smr at alioth.debian.org
Sat Aug 16 10:32:19 UTC 2008
Author: smr
Date: 2008-08-16 10:32:18 +0000 (Sat, 16 Aug 2008)
New Revision: 14275
Removed:
boost/trunk/debian/patches/serialisation-utility-include.patch
boost/trunk/debian/patches/serialization-intrinsic64.patch
boost/trunk/debian/patches/sp_counted_base.patch
Modified:
boost/trunk/debian/changelog
boost/trunk/debian/control
boost/trunk/debian/patches/gcc-4.3.patch
boost/trunk/debian/patches/series
Log:
New version. Initial adjustment of patches. Does not yet compile.
Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2008-08-16 01:01:27 UTC (rev 14274)
+++ boost/trunk/debian/changelog 2008-08-16 10:32:18 UTC (rev 14275)
@@ -1,3 +1,9 @@
+boost1.36 (1.36.0-1) UNRELEASED; urgency=low
+
+ * New upstream version. Closes: #495179.
+
+ -- Steve M. Robbins <smr at debian.org> Fri, 15 Aug 2008 20:03:17 -0500
+
boost1.35 (1.35.0-8) experimental; urgency=low
* debian/patches/jam-wall-clean.patch: Additional changes to expand.c,
Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control 2008-08-16 01:01:27 UTC (rev 14274)
+++ boost/trunk/debian/control 2008-08-16 10:32:18 UTC (rev 14275)
@@ -1,4 +1,4 @@
-Source: boost1.35
+Source: boost1.36
Homepage: http://www.boost.org/
Section: libs
Priority: optional
@@ -8,25 +8,25 @@
XS-Python-Version: 2.4, 2.5
Standards-Version: 3.8.0
-Package: libboost1.35-dbg
+Package: libboost1.36-dbg
Architecture: any
Section: libdevel
Priority: extra
Depends: ${shlibs:Depends}
-Conflicts: libboost-dbg
-Suggests: libboost1.35-dev (= ${binary:Version})
+Conflicts: libboost-dbg, libboost1.35-dbg
+Suggests: libboost1.36-dev (= ${binary:Version})
Description: Boost C++ Libraries with debug symbols
Part of the Boost C++ Libraries collection.
.
These libraries are built with debug symbols. They are useful to debug
programs which use Boost. These must be used also at build/link time.
-Package: libboost1.35-dev
+Package: libboost1.36-dev
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, libstdc++-dev, libboost-serialization1.35-dev (= ${binary:Version})
-Recommends: libboost1.35-doc, libboost-date-time1.35-dev, libboost-filesystem1.35-dev, libboost-graph1.35-dev, libboost-iostreams1.35-dev, libboost-program-options1.35-dev, libboost-python1.35-dev, libboost-regex1.35-dev, libboost-signals1.35-dev, libboost-test1.35-dev, libboost-thread1.35-dev, libboost-wave1.35-dev
-Conflicts: libboost-dev, bcp
+Depends: ${shlibs:Depends}, libstdc++-dev, libboost-serialization1.36-dev (= ${binary:Version})
+Recommends: libboost1.36-doc, libboost-date-time1.36-dev, libboost-filesystem1.36-dev, libboost-graph1.36-dev, libboost-iostreams1.36-dev, libboost-program-options1.36-dev, libboost-python1.36-dev, libboost-regex1.36-dev, libboost-signals1.36-dev, libboost-test1.36-dev, libboost-thread1.36-dev, libboost-wave1.36-dev
+Conflicts: libboost-dev, bcp, libboost1.35-dev
Description: Boost C++ Libraries development files
The Boost web site provides free, peer-reviewed, portable C++ source
libraries. The emphasis is on libraries which work well with the C++
@@ -41,12 +41,12 @@
For the following subprojects separate packages exist:
date-time, filesystem, graph, python, regex, signals, test, and thread.
-Package: libboost1.35-doc
+Package: libboost1.36-doc
Homepage: http://www.boost.org/libs/
Architecture: all
Section: doc
-Suggests: libboost1.35-dev (>= ${source:Version})
-Conflicts: libboost-doc
+Suggests: libboost1.36-dev (>= ${source:Version})
+Conflicts: libboost-doc, libboost1.35-doc
Description: Boost.org libraries documentation
The Boost web site provides free, peer-reviewed, portable C++ source
libraries. The emphasis is on libraries which work well with the C++
@@ -56,11 +56,11 @@
already been proposed for inclusion in the C++ Standards Committee's
upcoming C++ Standard Library Technical Report.
.
- This is documentation for the libboost1.35-dev package in HTML format.
- Some pages point to header files provided in libboost1.35-dev package,
+ This is documentation for the libboost1.36-dev package in HTML format.
+ Some pages point to header files provided in libboost1.36-dev package,
so it is suggested to install the latter as well.
-Package: libboost-date-time1.35.0
+Package: libboost-date-time1.36.0
Homepage: http://www.boost.org/libs/date_time/
Architecture: any
Section: libs
@@ -71,19 +71,19 @@
These libraries are intended to make programming with dates and times
almost as simple and natural as programming with strings and integers.
-Package: libboost-date-time1.35-dev
+Package: libboost-date-time1.36-dev
Homepage: http://www.boost.org/libs/date_time/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-date-time1.35.0 (= ${binary:Version}), libboost-serialization1.35-dev (= ${binary:Version})
-Conflicts: libboost-date-time-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-date-time1.36.0 (= ${binary:Version}), libboost-serialization1.36-dev (= ${binary:Version})
+Conflicts: libboost-date-time-dev, libboost-date-time1.36-dev
Description: set of date-time libraries based on generic programming concepts
Part of the Boost C++ Libraries collection.
.
These libraries are intended to make programming with dates and times
almost as simple and natural as programming with strings and integers.
-Package: libboost-filesystem1.35.0
+Package: libboost-filesystem1.36.0
Homepage: http://boost.org/libs/filesystem/
Architecture: any
Section: libs
@@ -95,12 +95,12 @@
manipulate paths, files, and directories. The goal is to
facilitate portable script-like operations from within C++ programs.
-Package: libboost-filesystem1.35-dev
+Package: libboost-filesystem1.36-dev
Homepage: http://boost.org/libs/filesystem/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-filesystem1.35.0 (= ${binary:Version}), libboost-system1.35-dev (= ${binary:Version})
-Conflicts: libboost-filesystem-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-filesystem1.36.0 (= ${binary:Version}), libboost-system1.36-dev (= ${binary:Version})
+Conflicts: libboost-filesystem-dev, libboost-filesystem1.35-dev
Description: filesystem operations (portable paths, iteration over directories, etc) in C++
Part of the Boost C++ Libraries collection.
.
@@ -108,7 +108,7 @@
manipulate paths, files, and directories. The goal is to
facilitate portable script-like operations from within C++ programs.
-Package: libboost-graph1.35.0
+Package: libboost-graph1.36.0
Homepage: http://www.boost.org/libs/graph/
Architecture: any
Section: libs
@@ -123,13 +123,13 @@
standardized generic interface for traversing graphs is of utmost
importance to encourage reuse of graph algorithms and data structures.
-Package: libboost-graph1.35-dev
+Package: libboost-graph1.36-dev
Homepage: http://www.boost.org/libs/graph/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-serialization1.35-dev (= ${binary:Version}), libboost-test1.35-dev (= ${binary:Version})
-Recommends: libboost-graph1.35.0 (= ${binary:Version})
-Conflicts: libboost-graph-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-serialization1.36-dev (= ${binary:Version}), libboost-test1.36-dev (= ${binary:Version})
+Recommends: libboost-graph1.36.0 (= ${binary:Version})
+Conflicts: libboost-graph-dev, libboost-graph1.35-dev
Description: generic graph components and algorithms in C++
Part of the Boost C++ Libraries collection.
.
@@ -139,7 +139,7 @@
standardized generic interface for traversing graphs is of utmost
importance to encourage reuse of graph algorithms and data structures.
-Package: libboost-iostreams1.35.0
+Package: libboost-iostreams1.36.0
Homepage: http://www.boost.org/libs/iostreams/
Architecture: any
Section: libs
@@ -151,12 +151,12 @@
which turn models of these concepts into C++ standard library streams
and stream buffers.
-Package: libboost-iostreams1.35-dev
+Package: libboost-iostreams1.36-dev
Homepage: http://www.boost.org/libs/iostreams/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-regex1.35-dev (= ${binary:Version}), libboost-iostreams1.35.0 (= ${binary:Version})
-Conflicts: libboost-iostreams-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-regex1.36-dev (= ${binary:Version}), libboost-iostreams1.36.0 (= ${binary:Version})
+Conflicts: libboost-iostreams-dev, libboost-iostreams1.35-dev
Description: Boost.Iostreams Library development files
Part of the Boost C++ Libraries collection.
.
@@ -164,7 +164,7 @@
which turn models of these concepts into C++ standard library streams
and stream buffers.
-Package: libboost-program-options1.35.0
+Package: libboost-program-options1.36.0
Homepage: http://www.boost.org/libs/program_options/
Architecture: any
Section: libs
@@ -176,12 +176,12 @@
(name, value) pairs from the user, via conventional methods such as
command line and config file.
-Package: libboost-program-options1.35-dev
+Package: libboost-program-options1.36-dev
Homepage: http://www.boost.org/libs/program_options/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-program-options1.35.0 (= ${binary:Version})
-Conflicts: libboost-program-options-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-program-options1.36.0 (= ${binary:Version})
+Conflicts: libboost-program-options-dev, libboost-program-options1.35-dev
Description: program options library for C++
Part of the Boost C++ Libraries collection.
.
@@ -189,7 +189,7 @@
(name, value) pairs from the user, via conventional methods such as
command line and config file.
-Package: libboost-python1.35.0
+Package: libboost-python1.36.0
Homepage: http://www.boost.org/libs/python/
Architecture: any
Section: python
@@ -208,13 +208,13 @@
in Python, Member function Overloading, Automatic wrapping of
numeric operators among others.
-Package: libboost-python1.35-dev
+Package: libboost-python1.36-dev
Homepage: http://www.boost.org/libs/python/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-python1.35.0 (= ${binary:Version}), python-dev, ${python:Depends}, python (>= 2.5) | python-celementtree | python-elementtree, gccxml
-Suggests: libboost1.35-doc
-Conflicts: libboost-python-dev, pyste
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-python1.36.0 (= ${binary:Version}), python-dev, ${python:Depends}, python (>= 2.5) | python-celementtree | python-elementtree, gccxml
+Suggests: libboost1.36-doc
+Conflicts: libboost-python-dev, pyste, libboost-python1.36-dev
Description: Boost.Python Library development files
Part of the Boost C++ Libraries collection.
.
@@ -238,7 +238,7 @@
versions of Python in Debian. Code using this library will need also
one of the Python development packages.
-Package: libboost-regex1.35.0
+Package: libboost-regex1.36.0
Homepage: http://www.boost.org/libs/regex/
Architecture: any
Section: libs
@@ -257,12 +257,12 @@
manner analogous to either sed or perl), something that traditional C
libraries can not do.
-Package: libboost-regex1.35-dev
+Package: libboost-regex1.36-dev
Homepage: http://www.boost.org/libs/regex/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-regex1.35.0 (= ${binary:Version}), libicu-dev
-Conflicts: libboost-regex-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-regex1.36.0 (= ${binary:Version}), libicu-dev
+Conflicts: libboost-regex-dev, libboost-regex1.35-dev
Description: regular expression library for C++
Part of the Boost C++ Libraries collection.
.
@@ -277,7 +277,7 @@
manner analogous to either sed or perl), something that traditional C
libraries can not do.
-Package: libboost-serialization1.35.0
+Package: libboost-serialization1.36.0
Homepage: http://www.boost.org/libs/serialization/
Architecture: any
Section: libs
@@ -296,12 +296,12 @@
C++ data structures to a sequence of bytes.
archive: to refer to a specific rendering of this stream of bytes.
-Package: libboost-serialization1.35-dev
+Package: libboost-serialization1.36-dev
Homepage: http://www.boost.org/libs/serialization/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-serialization1.35.0 (= ${binary:Version})
-Conflicts: libboost-serialization-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-serialization1.36.0 (= ${binary:Version})
+Conflicts: libboost-serialization-dev, libboost-serialization1.35-dev
Description: serialization library for C++
This is a partial list of provided functionalities:
.
@@ -316,7 +316,7 @@
C++ data structures to a sequence of bytes.
archive: to refer to a specific rendering of this stream of bytes.
-Package: libboost-signals1.35.0
+Package: libboost-signals1.36.0
Homepage: http://www.boost.org/libs/signals/
Architecture: any
Section: libs
@@ -330,12 +330,12 @@
targets or subscribers), which are called when the signal is
"emitted."
-Package: libboost-signals1.35-dev
+Package: libboost-signals1.36-dev
Homepage: http://www.boost.org/libs/signals/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-signals1.35.0 (= ${binary:Version})
-Conflicts: libboost-signals-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-signals1.36.0 (= ${binary:Version})
+Conflicts: libboost-signals-dev, libboost-signals1.35-dev
Description: managed signals and slots library for C++
Part of the Boost C++ Libraries collection.
.
@@ -345,7 +345,7 @@
targets or subscribers), which are called when the signal is
"emitted."
-Package: libboost-system1.35.0
+Package: libboost-system1.36.0
Homepage: http://www.boost.org/libs/system/
Architecture: any
Section: libs
@@ -361,11 +361,11 @@
user-defined sources, each error_code and error_condition has an
associated error_category.
-Package: libboost-system1.35-dev
+Package: libboost-system1.36-dev
Homepage: http://www.boost.org/libs/system/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-system1.35.0 (= ${binary:Version})
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-system1.36.0 (= ${binary:Version})
Description: Operating system (e.g. diagnostics support) library
Part of the Boost C++ Libraries collection.
.
@@ -377,7 +377,7 @@
user-defined sources, each error_code and error_condition has an
associated error_category.
-Package: libboost-test1.35.0
+Package: libboost-test1.36.0
Homepage: http://www.boost.org/libs/test/
Architecture: any
Section: libs
@@ -390,12 +390,12 @@
* Facilities to monitor program execution and produce error reports.
* Unit test framework to simplify writing test cases.
-Package: libboost-test1.35-dev
+Package: libboost-test1.36-dev
Homepage: http://www.boost.org/libs/test/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-test1.35.0 (= ${binary:Version})
-Conflicts: libboost-test-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-test1.36.0 (= ${binary:Version})
+Conflicts: libboost-test-dev, libboost-test1.35-dev
Description: components for writing and executing test suites
Part of the Boost C++ Libraries collection. The library contains
several components.
@@ -404,7 +404,7 @@
* Facilities to monitor program execution and produce error reports.
* Unit test framework to simplify writing test cases.
-Package: libboost-thread1.35.0
+Package: libboost-thread1.36.0
Homepage: http://www.boost.org/libs/thread/
Architecture: any
Section: libs
@@ -417,12 +417,12 @@
own machine state including program instruction counter and
registers.
-Package: libboost-thread1.35-dev
+Package: libboost-thread1.36-dev
Homepage: http://www.boost.org/libs/thread/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-date-time1.35-dev (= ${binary:Version}), libboost-thread1.35.0 (= ${binary:Version})
-Conflicts: libboost-thread-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-date-time1.36-dev (= ${binary:Version}), libboost-thread1.36.0 (= ${binary:Version})
+Conflicts: libboost-thread-dev, libboost-thread1.35-dev
Description: portable C++ multi-threading
Part of the Boost C++ Libraries collection.
.
@@ -431,7 +431,7 @@
own machine state including program instruction counter and
registers.
-Package: libboost-wave1.35.0
+Package: libboost-wave1.36.0
Homepage: http://www.boost.org/libs/wave/
Architecture: any
Section: libs
@@ -444,12 +444,12 @@
packed behind a simple to use interface, which integrates well with
the well known idioms of the Standard Template Library (STL).
-Package: libboost-wave1.35-dev
+Package: libboost-wave1.36-dev
Homepage: http://www.boost.org/libs/wave/
Architecture: any
Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-serialization1.35-dev (= ${binary:Version}), libboost-wave1.35.0 (= ${binary:Version}), libboost-filesystem1.35-dev (= ${binary:Version})
-Conflicts: libboost-wave-dev
+Depends: libboost1.36-dev (= ${binary:Version}), libboost-serialization1.36-dev (= ${binary:Version}), libboost-wave1.36.0 (= ${binary:Version}), libboost-filesystem1.36-dev (= ${binary:Version})
+Conflicts: libboost-wave-dev, libboost-wave1.35-dev
Description: C99/C++ preprocessor library
Part of the Boost C++ Libraries collection.
.
Modified: boost/trunk/debian/patches/gcc-4.3.patch
===================================================================
--- boost/trunk/debian/patches/gcc-4.3.patch 2008-08-16 01:01:27 UTC (rev 14274)
+++ boost/trunk/debian/patches/gcc-4.3.patch 2008-08-16 10:32:18 UTC (rev 14275)
@@ -1,16 +1,6 @@
---- boost1.35-1.35.0.orig/boost/spirit/phoenix/operators.hpp
-+++ boost1.35-1.35.0/boost/spirit/phoenix/operators.hpp
-@@ -25,6 +25,7 @@
- #include <boost/spirit/phoenix/composite.hpp>
- #include <boost/config.hpp>
- #include <boost/mpl/if.hpp>
-+#include <climits>
-
- ///////////////////////////////////////////////////////////////////////////////
- namespace phoenix {
--- boost1.35-1.35.0.orig/boost/date_time/tz_db_base.hpp
+++ boost1.35-1.35.0/boost/date_time/tz_db_base.hpp
-@@ -158,7 +158,7 @@
+@@ -158,8 +158,8 @@
typedef typename time_zone_type::base_type time_zone_base_type;
typedef typename time_zone_type::time_duration_type time_duration_type;
typedef time_zone_names_base<char_type> time_zone_names;
@@ -19,24 +9,3 @@
typedef std::basic_string<char_type> string_type;
//! Constructs an empty database
---- boost1.35-1.35.0.orig/libs/spirit/test/numerics_tests.cpp
-+++ boost1.35-1.35.0/libs/spirit/test/numerics_tests.cpp
-@@ -12,6 +12,7 @@
- #include <climits>
- #include <iostream>
- #include <boost/detail/lightweight_test.hpp>
-+#include <climits>
-
- using namespace std;
- using namespace boost::spirit;
---- boost1.35-1.35.0.orig/boost/gil/bit_aligned_pixel_reference.hpp
-+++ boost1.35-1.35.0/boost/gil/bit_aligned_pixel_reference.hpp
-@@ -121,7 +121,7 @@
- bool IsMutable>
- struct bit_aligned_pixel_reference {
- BOOST_STATIC_CONSTANT(int, bit_size = (mpl::accumulate<ChannelBitSizes, mpl::int_<0>, mpl::plus<mpl::_1, mpl::_2> >::type::value));
-- typedef bit_range<bit_size,IsMutable> bit_range_t;
-+ typedef boost::gil::bit_range<bit_size,IsMutable> bit_range_t;
- typedef BitField bitfield_t;
- typedef typename mpl::if_c<IsMutable,unsigned char*,const unsigned char*>::type data_ptr_t;
-
Deleted: boost/trunk/debian/patches/serialisation-utility-include.patch
===================================================================
--- boost/trunk/debian/patches/serialisation-utility-include.patch 2008-08-16 01:01:27 UTC (rev 14274)
+++ boost/trunk/debian/patches/serialisation-utility-include.patch 2008-08-16 10:32:18 UTC (rev 14275)
@@ -1,15 +0,0 @@
-Fix for #491225, taken from upstream
-http://svn.boost.org/trac/boost/ticket/1822
-
-
-
---- boost1.35-1.35.0.orig/boost/serialization/utility.hpp
-+++ boost1.35-1.35.0/boost/serialization/utility.hpp
-@@ -23,6 +23,7 @@
- #include <boost/type_traits/remove_const.hpp>
- #include <boost/serialization/nvp.hpp>
- #include <boost/serialization/is_bitwise_serializable.hpp>
-+#include <boost/mpl/and.hpp>
-
- namespace boost {
- namespace serialization {
Deleted: boost/trunk/debian/patches/serialization-intrinsic64.patch
===================================================================
--- boost/trunk/debian/patches/serialization-intrinsic64.patch 2008-08-16 01:01:27 UTC (rev 14274)
+++ boost/trunk/debian/patches/serialization-intrinsic64.patch 2008-08-16 10:32:18 UTC (rev 14275)
@@ -1,77 +0,0 @@
-Fixes build error on some architectures, likely 64-bit ones that use
-GCC 4.3.
-
-Reported upstream http://svn.boost.org/trac/boost/ticket/1715
-Patch pulled from upstream SVN, changesets
-
-------------------------------------------------------------------------
-r43958 | ramey | 2008-03-31 11:49:53 -0500 (Mon, 31 Mar 2008) | 1 line
-
-correction of error which prevented compilation on gcc 43 - again
-------------------------------------------------------------------------
-r43955 | ramey | 2008-03-31 10:46:48 -0500 (Mon, 31 Mar 2008) | 1 line
-
-Corrected error in detection of 64 bit support
-------------------------------------------------------------------------
-
-
---- boost1.35-1.35.0.orig/boost/archive/polymorphic_iarchive.hpp
-+++ boost1.35-1.35.0/boost/archive/polymorphic_iarchive.hpp
-@@ -17,6 +17,7 @@
- // See http://www.boost.org for updates, documentation, and revision history.
-
- #include <cstddef> // std::size_t
-+#include <climits> // ULONG_MAX
- #include <boost/config.hpp>
-
- #if defined(BOOST_NO_STDC_NAMESPACE)
-@@ -38,9 +39,16 @@
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
- // we shouldn't define separate functions for int64 data types.
--#if defined(BOOST_NO_INT64_T) \
-- || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
--# define BOOST_NO_INTRINSIC_INT64_T
-+#if defined(BOOST_NO_INT64_T)
-+ #define BOOST_NO_INTRINSIC_INT64_T
-+#else
-+ #if defined(ULONG_MAX)
-+ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-+ #define BOOST_NO_INTRINSIC_INT64_T
-+ #endif
-+ #else
-+ #define BOOST_NO_INTRINSIC_INT64_T
-+ #endif
- #endif
-
- namespace boost {
---- boost1.35-1.35.0.orig/boost/archive/polymorphic_oarchive.hpp
-+++ boost1.35-1.35.0/boost/archive/polymorphic_oarchive.hpp
-@@ -17,6 +17,7 @@
- // See http://www.boost.org for updates, documentation, and revision history.
-
- #include <cstddef> // size_t
-+#include <climits> // ULONG_MAX
- #include <string>
-
- #include <boost/config.hpp>
-@@ -37,9 +38,16 @@
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
- // we shouldn't define separate functions for int64 data types.
--#if defined(BOOST_NO_INT64_T) \
-- || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
--# define BOOST_NO_INTRINSIC_INT64_T
-+#if defined(BOOST_NO_INT64_T)
-+ #define BOOST_NO_INTRINSIC_INT64_T
-+#else
-+ #if defined(ULONG_MAX)
-+ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-+ #define BOOST_NO_INTRINSIC_INT64_T
-+ #endif
-+ #else
-+ #define BOOST_NO_INTRINSIC_INT64_T
-+ #endif
- #endif
-
- namespace boost {
Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series 2008-08-16 01:01:27 UTC (rev 14274)
+++ boost/trunk/debian/patches/series 2008-08-16 10:32:18 UTC (rev 14275)
@@ -2,11 +2,8 @@
jam-wall-clean.patch
python2.5-elementtree.patch
test-child-exit-t1723.patch
-serialization-intrinsic64.patch
library-naming.patch
suppress-compiler-warnings.patch
-serialisation-utility-include.patch
-sp_counted_base.patch
kfreebsd-poll-symbols.patch
gcc-4.3.patch
date_time_date_formatting_hpp.patch
Deleted: boost/trunk/debian/patches/sp_counted_base.patch
===================================================================
--- boost/trunk/debian/patches/sp_counted_base.patch 2008-08-16 01:01:27 UTC (rev 14274)
+++ boost/trunk/debian/patches/sp_counted_base.patch 2008-08-16 10:32:18 UTC (rev 14275)
@@ -1,11 +0,0 @@
---- boost1.35-1.35.0.orig/boost/detail/sp_counted_base.hpp
-+++ boost1.35-1.35.0/boost/detail/sp_counted_base.hpp
-@@ -51,7 +51,7 @@
-
- # include <boost/detail/sp_counted_base_gcc_ppc.hpp>
-
--#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
-+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa )
-
- # include <boost/detail/sp_counted_base_sync.hpp>
-
More information about the pkg-boost-commits
mailing list