[pkg-boost-commits] r14562 - in boost/branches/1.40.0/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2010-01-19 05:23:26 +0000 (Tue, 19 Jan 2010)
New Revision: 14562

Added:
   boost/branches/1.40.0/debian/patches/boost-graph-printf.patch
   boost/branches/1.40.0/debian/patches/kfreebsd-thread.patch
   boost/branches/1.40.0/debian/patches/mapped_file-header-guard.patch
Modified:
   boost/branches/1.40.0/debian/changelog
   boost/branches/1.40.0/debian/patches/date_time_date_formatting_hpp.patch
   boost/branches/1.40.0/debian/patches/series
Log:
Merge changes from 1.41.0-1 through 1.41.0-3 inclusive back to 1.40 branch.

Modified: boost/branches/1.40.0/debian/changelog
===================================================================
--- boost/branches/1.40.0/debian/changelog	2010-01-18 04:47:33 UTC (rev 14561)
+++ boost/branches/1.40.0/debian/changelog	2010-01-19 05:23:26 UTC (rev 14562)
@@ -1,3 +1,21 @@
+boost1.40 (1.40.0-6) unstable; urgency=low
+
+  * Backport changes from 1.41.0-1 through 1.41.0-3 inclusive.
+
+  * patches/date_time_date_formatting_hpp.patch: Change
+    std::locale::locale() to std::locale().  Closes: #564863.
+
+  * patches/boost-graph-printf.patch: New.  Include stdio.h, to define
+    fprintf() and stderr.  Closes: #562215.
+  
+  * patches/kfreebsd-thread.patch: New (thanks, Petr Salinger).  Fix
+    checks for __GLIBC__ source so that it builds on GNU/kFreeBSD.  
+
+  * patches/mapped_file-header-guard.patch: New.  Add missing header guard
+    (thanks, Sven Geggus).
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 18 Jan 2010 23:19:45 -0600
+
 boost1.40 (1.40.0-5) unstable; urgency=low
 
   * control:

Copied: boost/branches/1.40.0/debian/patches/boost-graph-printf.patch (from rev 14561, boost/trunk/debian/patches/boost-graph-printf.patch)
===================================================================
--- boost/branches/1.40.0/debian/patches/boost-graph-printf.patch	                        (rev 0)
+++ boost/branches/1.40.0/debian/patches/boost-graph-printf.patch	2010-01-19 05:23:26 UTC (rev 14562)
@@ -0,0 +1,10 @@
+--- boost1.41-1.41.0.orig/boost/graph/distributed/detail/mpi_process_group.ipp
++++ boost1.41-1.41.0/boost/graph/distributed/detail/mpi_process_group.ipp
+@@ -28,6 +28,7 @@
+ #include <queue>
+ #include <stack>
+ #include <boost/graph/distributed/detail/tag_allocator.hpp>
++#include <stdio.h>
+ 
+ // #define PBGL_PROCESS_GROUP_DEBUG
+ 

Modified: boost/branches/1.40.0/debian/patches/date_time_date_formatting_hpp.patch
===================================================================
--- boost/branches/1.40.0/debian/patches/date_time_date_formatting_hpp.patch	2010-01-18 04:47:33 UTC (rev 14561)
+++ boost/branches/1.40.0/debian/patches/date_time_date_formatting_hpp.patch	2010-01-19 05:23:26 UTC (rev 14562)
@@ -12,7 +12,7 @@
 +      // of year with comma or other character (for example 2,008).
 +      ss.imbue(std::locale::classic());
        ss << ymd.year;
-+      ss.imbue(std::locale::locale());
++      ss.imbue(std::locale());
 +
        if (format_type::has_date_sep_chars()) {
          ss << format_type::month_sep_char();

Copied: boost/branches/1.40.0/debian/patches/kfreebsd-thread.patch (from rev 14561, boost/trunk/debian/patches/kfreebsd-thread.patch)
===================================================================
--- boost/branches/1.40.0/debian/patches/kfreebsd-thread.patch	                        (rev 0)
+++ boost/branches/1.40.0/debian/patches/kfreebsd-thread.patch	2010-01-19 05:23:26 UTC (rev 14562)
@@ -0,0 +1,20 @@
+--- boost1.41-1.41.0.orig/libs/thread/src/pthread/thread.cpp
++++ boost1.41-1.41.0/libs/thread/src/pthread/thread.cpp
+@@ -13,7 +13,7 @@
+ #include <boost/thread/locks.hpp>
+ #include <boost/thread/once.hpp>
+ #include <boost/thread/tss.hpp>
+-#ifdef __linux__
++#ifdef __GLIBC__
+ #include <sys/sysinfo.h>
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+ #include <sys/types.h>
+@@ -380,7 +380,7 @@
+     {
+ #if defined(PTW32_VERSION) || defined(__hpux)
+         return pthread_num_processors_np();
+-#elif defined(_GNU_SOURCE)
++#elif defined(__GLIBC__)
+         return get_nprocs();
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+         int count;

Copied: boost/branches/1.40.0/debian/patches/mapped_file-header-guard.patch (from rev 14561, boost/trunk/debian/patches/mapped_file-header-guard.patch)
===================================================================
--- boost/branches/1.40.0/debian/patches/mapped_file-header-guard.patch	                        (rev 0)
+++ boost/branches/1.40.0/debian/patches/mapped_file-header-guard.patch	2010-01-19 05:23:26 UTC (rev 14562)
@@ -0,0 +1,18 @@
+--- boost1.41-1.41.0.orig/boost/iostreams/device/mapped_file.hpp
++++ boost1.41-1.41.0/boost/iostreams/device/mapped_file.hpp
+@@ -4,6 +4,9 @@
+ // Distributed under the Boost Software License, Version 1.0. (See accompanying
+ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.)
+ 
++#ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
++#define BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
++
+ #if defined(_MSC_VER) && (_MSC_VER >= 1020)
+ # pragma once
+ #endif
+@@ -591,3 +594,5 @@
+ } } // End namespaces iostreams, boost.
+ 
+ #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
++
++#endif // #ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED

Modified: boost/branches/1.40.0/debian/patches/series
===================================================================
--- boost/branches/1.40.0/debian/patches/series	2010-01-18 04:47:33 UTC (rev 14561)
+++ boost/branches/1.40.0/debian/patches/series	2010-01-19 05:23:26 UTC (rev 14562)
@@ -11,3 +11,6 @@
 hurd-ellint_rd.patch
 hurd-execution_monitor.patch
 gcc-4.patch
+mapped_file-header-guard.patch
+boost-graph-printf.patch
+kfreebsd-thread.patch