[pkg-boost-commits] r14569 - in boost/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2010-02-06 04:25:20 +0000 (Sat, 06 Feb 2010)
New Revision: 14569

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/hurd-execution_monitor.patch
   boost/trunk/debian/patches/series
   boost/trunk/debian/patches/sh4.patch
Log:
Remove patches applied upstream for Boost 1.42.0

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2010-02-06 04:06:17 UTC (rev 14568)
+++ boost/trunk/debian/changelog	2010-02-06 04:25:20 UTC (rev 14569)
@@ -1,9 +1,15 @@
 boost1.42 (1.42.0-1) unstable; urgency=low
 
   * New upstream.
+  
+  * patches/boost-test-invalid-read.patch: Remove.  Alternate fix applied
+    upstream.
 
- -- Steve M. Robbins <smr at debian.org>  Fri, 05 Feb 2010 21:40:15 -0600
+  * patches/boost/iostreams/device/mapped_file-header-guard.patch: 
+  * patches/boost-graph-printf.patch: Remove.  Applied upstream.
 
+ -- Steve M. Robbins <smr at debian.org>  Fri, 05 Feb 2010 22:24:51 -0600
+
 boost1.41 (1.41.0-3) unstable; urgency=low
 
   * patches/date_time_date_formatting_hpp.patch: Change

Modified: boost/trunk/debian/patches/hurd-execution_monitor.patch
===================================================================
--- boost/trunk/debian/patches/hurd-execution_monitor.patch	2010-02-06 04:06:17 UTC (rev 14568)
+++ boost/trunk/debian/patches/hurd-execution_monitor.patch	2010-02-06 04:25:20 UTC (rev 14569)
@@ -5,9 +5,9 @@
 Bug: 552383
 Forwarded: not yet
 
---- boost1.40-1.40.0.orig/boost/test/impl/execution_monitor.ipp
-+++ boost1.40-1.40.0/boost/test/impl/execution_monitor.ipp
-@@ -264,22 +264,37 @@
+--- boost1.42-1.42.0.orig/boost/test/impl/execution_monitor.ipp
++++ boost1.42-1.42.0/boost/test/impl/execution_monitor.ipp
+@@ -301,22 +301,37 @@
  public:
      // Constructor
      system_signal_exception()
@@ -45,7 +45,7 @@
  };
  
  //____________________________________________________________________________//
-@@ -287,6 +302,7 @@
+@@ -324,6 +339,7 @@
  void
  system_signal_exception::report() const
  {
@@ -53,7 +53,7 @@
      if( !m_sig_info )
          return; // no error actually occur?
  
-@@ -571,6 +587,59 @@
+@@ -608,6 +624,59 @@
      default:
          report_error( execution_exception::system_error, "unrecognized signal" );
      }
@@ -113,7 +113,7 @@
  }
  
  //____________________________________________________________________________//
-@@ -581,8 +650,13 @@
+@@ -618,8 +687,13 @@
  
  // Forward declaration
  extern "C" {
@@ -127,7 +127,7 @@
  }
  
  class signal_action {
-@@ -625,9 +699,14 @@
+@@ -662,9 +736,14 @@
          return;
      }
  
@@ -142,7 +142,7 @@
      BOOST_TEST_SYS_ASSERT( sigemptyset( &m_new_action.sa_mask ) != -1 );
  
  #ifdef BOOST_TEST_USE_ALT_STACK
-@@ -769,6 +848,7 @@
+@@ -813,6 +892,7 @@
  
  extern "C" {
  
@@ -150,7 +150,7 @@
  static bool ignore_sigchild( siginfo_t* info )
  {
      return info->si_signo == SIGCHLD
-@@ -781,9 +861,16 @@
+@@ -825,9 +905,16 @@
              && (int)info->si_status == 0;
  #endif
  }
@@ -167,7 +167,7 @@
  static void execution_monitor_jumping_signal_handler( int sig, siginfo_t* info, void* context )
  {
      if( ignore_sigchild( info ) )
-@@ -810,6 +897,34 @@
+@@ -854,6 +941,34 @@
  
  //____________________________________________________________________________//
  

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2010-02-06 04:06:17 UTC (rev 14568)
+++ boost/trunk/debian/patches/series	2010-02-06 04:25:20 UTC (rev 14569)
@@ -1,4 +1,3 @@
-boost-test-invalid-read.patch
 mips-asm.patch
 boost-python-examples.patch
 endian.patch
@@ -10,6 +9,4 @@
 boost-build-pythonid.patch
 hurd-ellint_rd.patch
 hurd-execution_monitor.patch
-mapped_file-header-guard.patch
-boost-graph-printf.patch
 kfreebsd-thread.patch

Modified: boost/trunk/debian/patches/sh4.patch
===================================================================
--- boost/trunk/debian/patches/sh4.patch	2010-02-06 04:06:17 UTC (rev 14568)
+++ boost/trunk/debian/patches/sh4.patch	2010-02-06 04:25:20 UTC (rev 14569)
@@ -2,9 +2,9 @@
 Patch based on initial work by Nobuhiro Iwamatsu
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535930
 
---- boost1.39-1.39.0.orig/boost/smart_ptr/detail/sp_has_sync.hpp
-+++ boost1.39-1.39.0/boost/smart_ptr/detail/sp_has_sync.hpp
-@@ -40,6 +40,10 @@
+--- boost1.42-1.42.0.orig/boost/smart_ptr/detail/sp_has_sync.hpp
++++ boost1.42-1.42.0/boost/smart_ptr/detail/sp_has_sync.hpp
+@@ -36,6 +36,10 @@
  #undef BOOST_SP_HAS_SYNC
  #endif
  
@@ -12,6 +12,6 @@
 +#undef BOOST_SP_HAS_SYNC
 +#endif
 +
- #if defined( __INTEL_COMPILER ) && !defined( __ia64__ )
+ #if defined( __sparc__ )
  #undef BOOST_SP_HAS_SYNC
  #endif