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

[Steven Michael Robbins]

Author: smr
Date: 2010-01-19 07:23:53 +0000 (Tue, 19 Jan 2010)
New Revision: 14563

Removed:
   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/kfreebsd-thread.patch
   boost/branches/1.40.0/debian/patches/series
Log:
Tweak kfreebsd-thread.patch, remove mapped_file-header-guard.patch.

Modified: boost/branches/1.40.0/debian/changelog
===================================================================
--- boost/branches/1.40.0/debian/changelog	2010-01-19 05:23:26 UTC (rev 14562)
+++ boost/branches/1.40.0/debian/changelog	2010-01-19 07:23:53 UTC (rev 14563)
@@ -11,9 +11,6 @@
   * 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

Modified: boost/branches/1.40.0/debian/patches/kfreebsd-thread.patch
===================================================================
--- boost/branches/1.40.0/debian/patches/kfreebsd-thread.patch	2010-01-19 05:23:26 UTC (rev 14562)
+++ boost/branches/1.40.0/debian/patches/kfreebsd-thread.patch	2010-01-19 07:23:53 UTC (rev 14563)
@@ -1,5 +1,5 @@
---- boost1.41-1.41.0.orig/libs/thread/src/pthread/thread.cpp
-+++ boost1.41-1.41.0/libs/thread/src/pthread/thread.cpp
+--- boost1.40-1.40.0.orig/libs/thread/src/pthread/thread.cpp
++++ boost1.40-1.40.0/libs/thread/src/pthread/thread.cpp
 @@ -13,7 +13,7 @@
  #include <boost/thread/locks.hpp>
  #include <boost/thread/once.hpp>
@@ -9,11 +9,11 @@
  #include <sys/sysinfo.h>
  #elif defined(__APPLE__) || defined(__FreeBSD__)
  #include <sys/types.h>
-@@ -380,7 +380,7 @@
+@@ -390,7 +390,7 @@
      {
  #if defined(PTW32_VERSION) || defined(__hpux)
          return pthread_num_processors_np();
--#elif defined(_GNU_SOURCE)
+-#elif defined(__linux__)
 +#elif defined(__GLIBC__)
          return get_nprocs();
  #elif defined(__APPLE__) || defined(__FreeBSD__)

Deleted: boost/branches/1.40.0/debian/patches/mapped_file-header-guard.patch
===================================================================
--- boost/branches/1.40.0/debian/patches/mapped_file-header-guard.patch	2010-01-19 05:23:26 UTC (rev 14562)
+++ boost/branches/1.40.0/debian/patches/mapped_file-header-guard.patch	2010-01-19 07:23:53 UTC (rev 14563)
@@ -1,18 +0,0 @@
---- 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-19 05:23:26 UTC (rev 14562)
+++ boost/branches/1.40.0/debian/patches/series	2010-01-19 07:23:53 UTC (rev 14563)
@@ -11,6 +11,5 @@
 hurd-ellint_rd.patch
 hurd-execution_monitor.patch
 gcc-4.patch
-mapped_file-header-guard.patch
 boost-graph-printf.patch
 kfreebsd-thread.patch