[pkg-boost-commits] r14300 - boost/trunk/debian/patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-11-05 04:34:42 +0000 (Wed, 05 Nov 2008)
New Revision: 14300

Removed:
   boost/trunk/debian/patches/gcc43-spirit-1617.patch
   boost/trunk/debian/patches/kfreebsd-poll-symbols.patch
   boost/trunk/debian/patches/test-child-exit-t1723.patch
Modified:
   boost/trunk/debian/patches/series
Log:
Adjust patches for new upstream 1.37.0

Deleted: boost/trunk/debian/patches/gcc43-spirit-1617.patch
===================================================================
--- boost/trunk/debian/patches/gcc43-spirit-1617.patch	2008-11-02 23:34:10 UTC (rev 14299)
+++ boost/trunk/debian/patches/gcc43-spirit-1617.patch	2008-11-05 04:34:42 UTC (rev 14300)
@@ -1,38 +0,0 @@
-Fix for http://svn.boost.org/trac/boost/ticket/1617
-
---- boost1.36-1.36.0.orig/libs/spirit/classic/test/mix_and_match_trees.cpp
-+++ boost1.36-1.36.0/libs/spirit/classic/test/mix_and_match_trees.cpp
-@@ -54,7 +54,7 @@
- 
-         typedef rule<ast_scanner> ast_rule;
-         typedef rule<pt_scanner> pt_rule;
--        typedef rule<Scanner> rule;
-+        typedef rule<Scanner> rule_;
- 
-         definition(my_grammar const & /* self */)
-         {
-@@ -62,12 +62,12 @@
-             start_ = gen_pt_node_d[ pt_rule_ ];
-         }
- 
--        rule const & start() const
-+        rule_ const & start() const
-         {
-             return start_;
-         }
- 
--        rule start_;
-+        rule_ start_;
-         ast_rule ast_rule_;
-         pt_rule pt_rule_;
-     };
---- boost1.36-1.36.0.orig/libs/spirit/classic/test/numerics_tests.cpp
-+++ boost1.36-1.36.0/libs/spirit/classic/test/numerics_tests.cpp
-@@ -11,6 +11,7 @@
- #include <boost/spirit/include/classic_assign_actor.hpp>
- #include <iostream>
- #include <boost/detail/lightweight_test.hpp>
-+#include <climits>
- 
- using namespace std;
- using namespace BOOST_SPIRIT_CLASSIC_NS;

Deleted: boost/trunk/debian/patches/kfreebsd-poll-symbols.patch
===================================================================
--- boost/trunk/debian/patches/kfreebsd-poll-symbols.patch	2008-11-02 23:34:10 UTC (rev 14299)
+++ boost/trunk/debian/patches/kfreebsd-poll-symbols.patch	2008-11-05 04:34:42 UTC (rev 14300)
@@ -1,24 +0,0 @@
-The FreeBSD kernel uses the same value for POLL_ERR and POLL_HUP,
-see http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/signal.h
-
-Fix for BTS #492786.
-Reported upstream as http://svn.boost.org/trac/boost/ticket/2152.
-Upstream ticket is closed as of 2008-09-15.
-
-
---- boost1.35-1.35.0.orig/boost/test/impl/execution_monitor.ipp
-+++ boost1.35-1.35.0/boost/test/impl/execution_monitor.ipp
-@@ -465,11 +465,13 @@
-                               "high priority input available; band event %d",
-                               (int)m_sig_info->si_band );
-                 break;
-+#if defined(POLL_ERR) && defined(POLL_HUP) && (POLL_ERR - POLL_HUP)
-             case POLL_HUP:
-                 report_error( execution_exception::system_error,
-                               "device disconnected; band event %d",
-                               (int)m_sig_info->si_band );
-                 break;
-+#endif
-             }
-             break;
- 

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-11-02 23:34:10 UTC (rev 14299)
+++ boost/trunk/debian/patches/series	2008-11-05 04:34:42 UTC (rev 14300)
@@ -2,11 +2,8 @@
 avoid-PATH_MAX.patch
 jam-wall-clean.patch
 python2.5-elementtree.patch
-test-child-exit-t1723.patch
 library-naming.patch
 suppress-compiler-warnings.patch
-kfreebsd-poll-symbols.patch
 gcc43-date_time.patch
-gcc43-spirit-1617.patch
 gcc43-path_name_check.patch
 date_time_date_formatting_hpp.patch

Deleted: boost/trunk/debian/patches/test-child-exit-t1723.patch
===================================================================
--- boost/trunk/debian/patches/test-child-exit-t1723.patch	2008-11-02 23:34:10 UTC (rev 14299)
+++ boost/trunk/debian/patches/test-child-exit-t1723.patch	2008-11-05 04:34:42 UTC (rev 14300)
@@ -1,29 +0,0 @@
-Fix for http://svn.boost.org/trac/boost/ticket/1723
-Boost.Test will report an error if a child process exits normally.
-
-Derived from change 44392 of Boost cvs.
-ignore SIGCHLD in case of regular child exit with code 0
-
-
---- boost1.35-1.35.0.orig/boost/test/impl/execution_monitor.ipp
-+++ boost1.35-1.35.0/boost/test/impl/execution_monitor.ipp
-@@ -680,6 +680,9 @@
- 
- static void execution_monitor_jumping_signal_handler( int sig, siginfo_t* info, void* context )
- {
-+    if( info->si_signo == SIGCHLD && info->si_code == CLD_EXITED && (int)info->si_status == 0 )
-+        return;
-+
-     signal_handler::sys_sig()( info, context );
- 
-     siglongjmp( signal_handler::jump_buffer(), sig );
-@@ -689,6 +692,9 @@
- 
- static void execution_monitor_attaching_signal_handler( int sig, siginfo_t* info, void* context )
- {
-+    if( info->si_signo == SIGCHLD && info->si_code == CLD_EXITED && (int)info->si_status == 0 )
-+        return;
-+
-     if( !debug::attach_debugger( false ) )
-     execution_monitor_jumping_signal_handler( sig, info, context );
-