[pkg-boost-commits] r14176 - in boost/trunk/debian: . patches
smr at alioth.debian.org
smr at alioth.debian.org
Sun Mar 23 05:32:28 UTC 2008
Author: smr
Date: 2008-03-23 05:32:27 +0000 (Sun, 23 Mar 2008)
New Revision: 14176
Removed:
boost/trunk/debian/patches/01-ublas1331.patch
boost/trunk/debian/patches/02-is_incrementable1331.patch
boost/trunk/debian/patches/03-st_mt.patch
boost/trunk/debian/patches/04-ublas_warnings.patch
boost/trunk/debian/patches/05_regex_fixes.patch
Modified:
boost/trunk/debian/changelog
Log:
Remove obsolete patch files.
Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2008-03-23 05:25:24 UTC (rev 14175)
+++ boost/trunk/debian/changelog 2008-03-23 05:32:27 UTC (rev 14176)
@@ -14,8 +14,15 @@
- debian/patches/function-template-thread-safety.patch
- debian/patches/bjam-no-strict-aliasing.patch
- debian/patches/gcc-4.3.patch
+
+ * Remove obsolete patch files:
+ - debian/patches/03-st_mt.patch
+ - debian/patches/02-is_incrementable1331.patch
+ - debian/patches/01-ublas1331.patch
+ - debian/patches/05_regex_fixes.patch
+ - debian/patches/04-ublas_warnings.patch
- -- Steve M. Robbins <steve at sumost.ca> Sat, 22 Mar 2008 22:41:18 -0500
+ -- Steve M. Robbins <smr at debian.org> Sun, 23 Mar 2008 00:32:07 -0500
boost (1.34.1-8) unstable; urgency=low
Deleted: boost/trunk/debian/patches/01-ublas1331.patch
===================================================================
--- boost/trunk/debian/patches/01-ublas1331.patch 2008-03-23 05:25:24 UTC (rev 14175)
+++ boost/trunk/debian/patches/01-ublas1331.patch 2008-03-23 05:32:27 UTC (rev 14176)
@@ -1,329 +0,0 @@
-Index: boost/numeric/ublas/exception.hpp
-===================================================================
---- boost/numeric/ublas/exception.hpp (revision 13869)
-+++ boost/numeric/ublas/exception.hpp (working copy)
-@@ -254,10 +254,8 @@
- // template<class E>
- // BOOST_UBLAS_INLINE
- // void check_ex (bool expression, const char *file, int line, const E &e) {}
--#define BOOST_UBLAS_CHECK(expression, e) \
-- if (! (expression) );
--#define BOOST_UBLAS_CHECK_EX(expression, file, line, e) \
-- if (! (expression) );
-+#define BOOST_UBLAS_CHECK(expression, e)
-+#define BOOST_UBLAS_CHECK_EX(expression, file, line, e)
- #endif
-
-
-Index: boost/numeric/ublas/vector.hpp
-===================================================================
---- boost/numeric/ublas/vector.hpp (revision 13869)
-+++ boost/numeric/ublas/vector.hpp (working copy)
-@@ -153,7 +153,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- vector &operator = (const vector_container<C> &v) {
-- resize (v.size (), false);
-+ resize (v ().size (), false);
- assign (v);
- return *this;
- }
-@@ -592,7 +592,7 @@
-
- // Resizing
- BOOST_UBLAS_INLINE
-- void resize (size_type size, bool preserve = true) {
-+ void resize (size_type size, bool /*preserve*/ = true) {
- size_ = size;
- }
-
-@@ -785,7 +785,7 @@
-
- // Resizing
- BOOST_UBLAS_INLINE
-- void resize (size_type size, bool preserve = true) {
-+ void resize (size_type size, bool /*preserve*/ = true) {
- size_ = size;
- }
-
-@@ -1304,7 +1304,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- c_vector &operator = (const vector_container<C> &v) {
-- resize (v.size (), false);
-+ resize (v ().size (), false);
- assign (v);
- return *this;
- }
-Index: boost/numeric/ublas/vector_proxy.hpp
-===================================================================
---- boost/numeric/ublas/vector_proxy.hpp (revision 13869)
-+++ boost/numeric/ublas/vector_proxy.hpp (working copy)
-@@ -973,13 +973,13 @@
- // Simple Projections
- template<class V>
- BOOST_UBLAS_INLINE
-- vector_slice<V> subslice (V &data, typename V::size_type_t start, typename V::differenece_type stride, typename V::size_type size) {
-+ vector_slice<V> subslice (V &data, typename V::size_type start, typename V::difference_type stride, typename V::size_type size) {
- typedef basic_slice<typename V::size_type, typename V::difference_type> slice_type;
- return vector_slice<V> (data, slice_type (start, stride, size));
- }
- template<class V>
- BOOST_UBLAS_INLINE
-- vector_slice<const V> subslice (const V &data, typename V::size_type start, typename V::differenece_type stride, typename V::size_type size) {
-+ vector_slice<const V> subslice (const V &data, typename V::size_type start, typename V::difference_type stride, typename V::size_type size) {
- typedef basic_slice<typename V::size_type, typename V::difference_type> slice_type;
- return vector_slice<const V> (data, slice_type (start, stride, size));
- }
-Index: boost/numeric/ublas/matrix.hpp
-===================================================================
---- boost/numeric/ublas/matrix.hpp (revision 13869)
-+++ boost/numeric/ublas/matrix.hpp (working copy)
-@@ -185,7 +185,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- matrix &operator = (const matrix_container<C> &m) {
-- resize (m.size1 (), m.size2 ());
-+ resize (m ().size1 (), m ().size2 (), false);
- assign (m);
- return *this;
- }
-@@ -1132,7 +1132,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- vector_of_vector &operator = (const matrix_container<C> &m) {
-- resize (m.size1 (), m.size2 ());
-+ resize (m ().size1 (), m ().size2 (), false);
- assign (m);
- return *this;
- }
-@@ -1989,7 +1989,7 @@
- size2_ = size;
- }
- BOOST_UBLAS_INLINE
-- void resize (size_type size1, size_type size2, bool preserve = true) {
-+ void resize (size_type size1, size_type size2, bool /*preserve*/ = true) {
- size1_ = size1;
- size2_ = size2;
- }
-@@ -2347,7 +2347,7 @@
- size2_ = size;
- }
- BOOST_UBLAS_INLINE
-- void resize (size_type size1, size_type size2, bool preserve = true) {
-+ void resize (size_type size1, size_type size2, bool /*preserve*/ = true) {
- size1_ = size1;
- size2_ = size2;
- }
-@@ -2721,14 +2721,14 @@
-
- // Resizing
- BOOST_UBLAS_INLINE
-- void resize (size_type size1, size_type size2, bool preserve = true) {
-+ void resize (size_type size1, size_type size2, bool /*preserve*/ = true) {
- size1_ = size1;
- size2_ = size2;
- }
-
- // Element access
- BOOST_UBLAS_INLINE
-- const_reference operator () (size_type i, size_type j) const {
-+ const_reference operator () (size_type /*i*/, size_type /*j*/) const {
- return value_;
- }
-
-@@ -3236,7 +3236,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- c_matrix &operator = (const matrix_container<C> &m) {
-- resize (m.size1 (), m.size2 ());
-+ resize (m ().size1 (), m ().size2 (), false);
- assign (m);
- return *this;
- }
-Index: boost/numeric/ublas/storage.hpp
-===================================================================
---- boost/numeric/ublas/storage.hpp (revision 13869)
-+++ boost/numeric/ublas/storage.hpp (working copy)
-@@ -292,15 +292,13 @@
- explicit BOOST_UBLAS_INLINE
- bounded_array (size_type size):
- size_ (size) /*, data_ ()*/ {
-- if (size_ > N)
-- bad_size ().raise ();
-+ BOOST_UBLAS_CHECK (size_ <= N, bad_size ());
- // data_ (an array) elements are already default constructed
- }
- BOOST_UBLAS_INLINE
- bounded_array (size_type size, const value_type &init):
- size_ (size) /*, data_ ()*/ {
-- if (size_ > N)
-- bad_size ().raise ();
-+ BOOST_UBLAS_CHECK (size_ <= N, bad_size ());
- // ISSUE elements should be value constructed here, but we must fill instead as already default constructed
- std::fill (begin(), end(), init) ;
- }
-@@ -315,14 +313,12 @@
- // Resizing
- BOOST_UBLAS_INLINE
- void resize (size_type size) {
-- if (size > N)
-- bad_size ().raise ();
-+ BOOST_UBLAS_CHECK (size_ <= N, bad_size ());
- size_ = size;
- }
- BOOST_UBLAS_INLINE
- void resize (size_type size, value_type init) {
-- if (size > N)
-- bad_size ().raise ();
-+ BOOST_UBLAS_CHECK (size_ <= N, bad_size ());
- if (size > size_)
- std::fill (data_ + size_, data_ + size, init);
- size_ = size;
-@@ -625,10 +621,10 @@
-
- typedef shallow_array_adaptor<T> self_type;
-
-- template<class T>
-+ template<class TT>
- struct leaker {
- typedef void result_type;
-- typedef T *argument_type;
-+ typedef TT *argument_type;
-
- BOOST_UBLAS_INLINE
- result_type operator () (argument_type x) {}
-Index: boost/numeric/ublas/matrix_proxy.hpp
-===================================================================
---- boost/numeric/ublas/matrix_proxy.hpp (revision 13869)
-+++ boost/numeric/ublas/matrix_proxy.hpp (working copy)
-@@ -4010,13 +4010,13 @@
- // Simple Projections
- template<class M>
- BOOST_UBLAS_INLINE
-- matrix_slice<M> subslice (M &data, typename M::size_type start1, typename M::differenece_type stride1, typename M::size_type size1, typename M::size_type start2, typename M::differenece_type stride2, typename M::size_type size2) {
-+ matrix_slice<M> subslice (M &data, typename M::size_type start1, typename M::difference_type stride1, typename M::size_type size1, typename M::size_type start2, typename M::difference_type stride2, typename M::size_type size2) {
- typedef basic_slice<typename M::size_type, typename M::difference_type> slice_type;
- return matrix_slice<M> (data, slice_type (start1, stride1, size1), slice_type (start2, stride2, size2));
- }
- template<class M>
- BOOST_UBLAS_INLINE
-- matrix_slice<const M> subslice (const M &data, typename M::size_type start1, typename M::differenece_type stride1, typename M::size_type size1, typename M::size_type start2, typename M::differenece_type stride2, typename M::size_type size2) {
-+ matrix_slice<const M> subslice (const M &data, typename M::size_type start1, typename M::difference_type stride1, typename M::size_type size1, typename M::size_type start2, typename M::difference_type stride2, typename M::size_type size2) {
- typedef basic_slice<typename M::size_type, typename M::difference_type> slice_type;
- return matrix_slice<const M> (data (), slice_type (start1, stride1, size1), slice_type (start2, stride2, size2));
- }
-Index: boost/numeric/ublas/vector_sparse.hpp
-===================================================================
---- boost/numeric/ublas/vector_sparse.hpp (revision 13869)
-+++ boost/numeric/ublas/vector_sparse.hpp (working copy)
-@@ -62,7 +62,7 @@
- }
- BOOST_UBLAS_INLINE
- sparse_vector_element (const sparse_vector_element &p):
-- container_reference<vector_type> (p), i_ (p.i_), d_ (p.d_) {}
-+ container_reference<vector_type> (p), i_ (p.i_) {}
- BOOST_UBLAS_INLINE
- ~sparse_vector_element () {
- }
-@@ -447,7 +447,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- mapped_vector &operator = (const vector_container<C> &v) {
-- resize (v.size (), false);
-+ resize (v ().size (), false);
- assign (v);
- return *this;
- }
-@@ -997,7 +997,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- compressed_vector &operator = (const vector_container<C> &v) {
-- resize (v.size (), false);
-+ resize (v ().size (), false);
- assign (v);
- return *this;
- }
-@@ -1615,7 +1615,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- coordinate_vector &operator = (const vector_container<C> &v) {
-- resize (v.size (), false);
-+ resize (v ().size (), false);
- assign (v);
- return *this;
- }
-Index: boost/numeric/ublas/matrix_sparse.hpp
-===================================================================
---- boost/numeric/ublas/matrix_sparse.hpp (revision 13869)
-+++ boost/numeric/ublas/matrix_sparse.hpp (working copy)
-@@ -64,7 +64,7 @@
- }
- BOOST_UBLAS_INLINE
- sparse_matrix_element (const sparse_matrix_element &p):
-- container_reference<matrix_type> (p), i_ (p.i_), d_ (p.d_) {}
-+ container_reference<matrix_type> (p), i_ (p.i_), j_ (p.j_) {}
- BOOST_UBLAS_INLINE
- ~sparse_matrix_element () {
- }
-@@ -431,7 +431,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- mapped_matrix &operator = (const matrix_container<C> &m) {
-- resize (m.size1 (), m.size2 ());
-+ resize (m ().size1 (), m ().size2 (), false);
- assign (m);
- return *this;
- }
-@@ -1500,7 +1500,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- mapped_vector_of_mapped_vector &operator = (const matrix_container<C> &m) {
-- resize (m.size1 (), m.size2 ());
-+ resize (m ().size1 (), m ().size2 ());
- assign (m);
- return *this;
- }
-@@ -2843,7 +2843,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- compressed_matrix &operator = (const matrix_container<C> &m) {
-- resize (m.size1 (), m.size2 ());
-+ resize (m ().size1 (), m ().size2 (), false);
- assign (m);
- return *this;
- }
-@@ -4008,6 +4008,7 @@
- value_data_.resize (capacity_);
- filled_ = 0;
- sorted_filled_ = filled_;
-+ sorted_ = true;
- storage_invariants ();
- }
-
-@@ -4137,6 +4138,7 @@
- size2_ = m.size2_;
- capacity_ = m.capacity_;
- filled_ = m.filled_;
-+ sorted_filled_ = m.sorted_filled_;
- sorted_ = m.sorted_;
- index1_data_ = m.index1_data_;
- index2_data_ = m.index2_data_;
-@@ -4151,7 +4153,7 @@
- template<class C> // Container assignment without temporary
- BOOST_UBLAS_INLINE
- coordinate_matrix &operator = (const matrix_container<C> &m) {
-- resize (m.size1 (), m.size2 ());
-+ resize (m ().size1 (), m ().size2 (), false);
- assign (m);
- return *this;
- }
-@@ -4302,7 +4304,7 @@
- BOOST_UBLAS_CHECK (filled_ > 0, external_logic ());
- -- filled_;
- sorted_filled_ = (std::min) (sorted_filled_, filled_);
-- sorted_ = sorted_filled_ = filled;
-+ sorted_ = sorted_filled_ = filled_;
- storage_invariants ();
- }
-
Deleted: boost/trunk/debian/patches/02-is_incrementable1331.patch
===================================================================
--- boost/trunk/debian/patches/02-is_incrementable1331.patch 2008-03-23 05:25:24 UTC (rev 14175)
+++ boost/trunk/debian/patches/02-is_incrementable1331.patch 2008-03-23 05:32:27 UTC (rev 14176)
@@ -1,47 +0,0 @@
---- boost/detail/is_incrementable.hpp 2005-10-25 20:21:17.838129392 +0200
-+++ /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/detail/is_incrementable.hpp 2005-10-17 09:48:11.000000000 +0200
-@@ -32,8 +32,26 @@
- struct any { template <class T> any(T const&); };
-
- // This is a last-resort operator++ for when none other is found
-+# if BOOST_WORKAROUND(__GNUC__, == 4) && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 2
-+
-+}
-+
-+namespace is_incrementable_2
-+{
-+ is_incrementable_::tag operator++(is_incrementable_::any const&);
-+ is_incrementable_::tag operator++(is_incrementable_::any const&,int);
-+}
-+using namespace is_incrementable_2;
-+
-+namespace is_incrementable_
-+{
-+
-+# else
-+
- tag operator++(any const&);
- tag operator++(any const&,int);
-+
-+# endif
-
- # if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3202)) \
- || BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-@@ -78,7 +96,7 @@
-
- template<typename T>
- struct is_incrementable
-- BOOST_TT_AUX_BOOL_C_BASE(::boost::detail::is_incrementable_::impl<T>::value)
-+BOOST_TT_AUX_BOOL_C_BASE(::boost::detail::is_incrementable_::impl<T>::value)
- {
- BOOST_TT_AUX_BOOL_TRAIT_VALUE_DECL(::boost::detail::is_incrementable_::impl<T>::value)
- BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_incrementable,(T))
-@@ -86,7 +104,7 @@
-
- template<typename T>
- struct is_postfix_incrementable
-- BOOST_TT_AUX_BOOL_C_BASE(::boost::detail::is_incrementable_::impl<T>::value)
-+BOOST_TT_AUX_BOOL_C_BASE(::boost::detail::is_incrementable_::impl<T>::value)
- {
- BOOST_TT_AUX_BOOL_TRAIT_VALUE_DECL(::boost::detail::is_incrementable_::postfix_impl<T>::value)
- BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_postfix_incrementable,(T))
Deleted: boost/trunk/debian/patches/03-st_mt.patch
===================================================================
--- boost/trunk/debian/patches/03-st_mt.patch 2008-03-23 05:25:24 UTC (rev 14175)
+++ boost/trunk/debian/patches/03-st_mt.patch 2008-03-23 05:32:27 UTC (rev 14176)
@@ -1,188 +0,0 @@
-diff -ur boost-1.33.0/debian/rules boost-1.33.0.st_mt/debian/rules
---- boost-1.33.0/debian/rules 2005-10-24 21:06:17.000000000 +0200
-+++ boost-1.33.0.st_mt/debian/rules 2005-10-24 21:03:38.000000000 +0200
-@@ -17,6 +17,8 @@
- # Boost libraries encode build information in the resulting library
- # filename: toolset, threading, runtime, and version.
- #
-+release_suffix_st = -gcc-$(boost_version)
-+debug_suffix_st = -gcc-d-$(boost_version)
- release_suffix = -gcc-mt-$(boost_version)
- debug_suffix = -gcc-mt-d-$(boost_version)
-
-@@ -33,7 +35,7 @@
- -sTOOLS=gcc \
- -sGCC=gcc \
- -sGXX=g++ \
-- -sBUILD="debug release <define>_REENTRANT <threading>multi" \
-+ -sBUILD="debug release <define>_REENTRANT <threading>single/multi" \
- -sPYTHON_VERSION=2.3 \
- -sPYTHON_ROOT=/usr
-
-@@ -135,6 +137,10 @@
- debian/tmp/usr/lib/libboost_date_time$(release_suffix).so.$(SOVERSION)
- dh_install -plibboost-dbg --autodest \
- debian/tmp/usr/lib/libboost_date_time$(debug_suffix).so.$(SOVERSION)
-+ dh_install -plibboost-date-time$(SOVERSION) --autodest \
-+ debian/tmp/usr/lib/libboost_date_time$(release_suffix_st).so.$(SOVERSION)
-+ dh_install -plibboost-dbg --autodest \
-+ debian/tmp/usr/lib/libboost_date_time$(debug_suffix_st).so.$(SOVERSION)
- dh_link -plibboost-dbg \
- usr/lib/libboost_date_time$(debug_suffix).so.$(SOVERSION) \
- usr/lib/debug/usr/lib/libboost_date_time$(release_suffix).so.$(SOVERSION)
-@@ -145,7 +151,9 @@
- debian/libboost-date-time-dev/usr/include/boost
- dh_install -plibboost-date-time-dev --autodest \
- debian/tmp/usr/lib/libboost_date_time$(release_suffix).a \
-- debian/tmp/usr/lib/libboost_date_time$(release_suffix).so
-+ debian/tmp/usr/lib/libboost_date_time$(release_suffix).so \
-+ debian/tmp/usr/lib/libboost_date_time$(release_suffix_st).a \
-+ debian/tmp/usr/lib/libboost_date_time$(release_suffix_st).so
- dh_link -plibboost-date-time-dev \
- usr/lib/libboost_date_time$(release_suffix).a \
- usr/lib/libboost_date_time.a \
-@@ -158,6 +166,10 @@
- debian/tmp/usr/lib/libboost_filesystem$(release_suffix).so.$(SOVERSION)
- dh_install -plibboost-dbg --autodest \
- debian/tmp/usr/lib/libboost_filesystem$(debug_suffix).so.$(SOVERSION)
-+ dh_install -plibboost-filesystem$(SOVERSION) --autodest \
-+ debian/tmp/usr/lib/libboost_filesystem$(release_suffix_st).so.$(SOVERSION)
-+ dh_install -plibboost-dbg --autodest \
-+ debian/tmp/usr/lib/libboost_filesystem$(debug_suffix_st).so.$(SOVERSION)
- dh_link -plibboost-dbg \
- usr/lib/libboost_filesystem$(debug_suffix).so.$(SOVERSION) \
- usr/lib/debug/usr/lib/libboost_filesystem$(release_suffix).so.$(SOVERSION)
-@@ -167,6 +179,8 @@
- mv debian/libboost-dev/usr/include/boost/filesystem \
- debian/libboost-filesystem-dev/usr/include/boost
- dh_install -plibboost-filesystem-dev --autodest \
-+ debian/tmp/usr/lib/libboost_filesystem$(release_suffix_st).a \
-+ debian/tmp/usr/lib/libboost_filesystem$(release_suffix_st).so \
- debian/tmp/usr/lib/libboost_filesystem$(release_suffix).a \
- debian/tmp/usr/lib/libboost_filesystem$(release_suffix).so
- dh_link -plibboost-filesystem-dev \
-@@ -199,6 +213,10 @@
- debian/tmp/usr/lib/libboost_program_options$(release_suffix).so.$(SOVERSION)
- dh_install -plibboost-dbg --autodest \
- debian/tmp/usr/lib/libboost_program_options$(debug_suffix).so.$(SOVERSION)
-+ dh_install -plibboost-program-options$(SOVERSION) --autodest \
-+ debian/tmp/usr/lib/libboost_program_options$(release_suffix_st).so.$(SOVERSION)
-+ dh_install -plibboost-dbg --autodest \
-+ debian/tmp/usr/lib/libboost_program_options$(debug_suffix_st).so.$(SOVERSION)
- dh_link -plibboost-dbg \
- usr/lib/libboost_program_options$(debug_suffix).so.$(SOVERSION) \
- usr/lib/debug/usr/lib/libboost_program_options$(release_suffix).so.$(SOVERSION)
-@@ -208,6 +226,8 @@
- mv debian/libboost-dev/usr/include/boost/program_options* \
- debian/libboost-program-options-dev/usr/include/boost
- dh_install -plibboost-program-options-dev --autodest \
-+ debian/tmp/usr/lib/libboost_program_options$(release_suffix_st).a \
-+ debian/tmp/usr/lib/libboost_program_options$(release_suffix_st).so \
- debian/tmp/usr/lib/libboost_program_options$(release_suffix).a \
- debian/tmp/usr/lib/libboost_program_options$(release_suffix).so
- dh_link -plibboost-program-options-dev \
-@@ -219,12 +239,16 @@
-
- # package libboost-python$(SOVERSION)
- dh_install -plibboost-python$(SOVERSION) --autodest \
-+ debian/tmp/usr/lib/libboost_python$(release_suffix_st).so.$(SOVERSION)
-+ dh_install -plibboost-python$(SOVERSION) --autodest \
- debian/tmp/usr/lib/libboost_python$(release_suffix).so.$(SOVERSION)
- mkdir -p debian/libboost-python$(SOVERSION)/usr/share/lintian/overrides
- install -m644 \
- debian/libboost-python$(SOVERSION).lintian-overrides \
- debian/libboost-python$(SOVERSION)/usr/share/lintian/overrides/libboost-python$(SOVERSION)
- dh_install -plibboost-dbg --autodest \
-+ debian/tmp/usr/lib/libboost_python$(debug_suffix_st).so.$(SOVERSION)
-+ dh_install -plibboost-dbg --autodest \
- debian/tmp/usr/lib/libboost_python$(debug_suffix).so.$(SOVERSION)
- dh_link -plibboost-dbg \
- usr/lib/libboost_python$(debug_suffix).so.$(SOVERSION) \
-@@ -235,6 +259,8 @@
- mv debian/libboost-dev/usr/include/boost/python* \
- debian/libboost-python-dev/usr/include/boost
- dh_install -plibboost-python-dev --autodest \
-+ debian/tmp/usr/lib/libboost_python$(release_suffix_st).so
-+ dh_install -plibboost-python-dev --autodest \
- debian/tmp/usr/lib/libboost_python$(release_suffix).so
- dh_link -plibboost-python-dev \
- usr/lib/libboost_python$(release_suffix).so \
-@@ -250,6 +276,10 @@
- debian/tmp/usr/lib/libboost_regex$(release_suffix).so.$(SOVERSION)
- dh_install -plibboost-dbg --autodest \
- debian/tmp/usr/lib/libboost_regex$(debug_suffix).so.$(SOVERSION)
-+ dh_install -plibboost-regex$(SOVERSION) --autodest \
-+ debian/tmp/usr/lib/libboost_regex$(release_suffix_st).so.$(SOVERSION)
-+ dh_install -plibboost-dbg --autodest \
-+ debian/tmp/usr/lib/libboost_regex$(debug_suffix_st).so.$(SOVERSION)
- dh_link -plibboost-dbg \
- usr/lib/libboost_regex$(debug_suffix).so.$(SOVERSION) \
- usr/lib/debug/usr/lib/libboost_regex$(release_suffix).so.$(SOVERSION)
-@@ -259,6 +289,8 @@
- mv debian/libboost-dev/usr/include/boost/*regex* \
- debian/libboost-regex-dev/usr/include/boost
- dh_install -plibboost-regex-dev --autodest \
-+ debian/tmp/usr/lib/libboost_regex$(release_suffix_st).a \
-+ debian/tmp/usr/lib/libboost_regex$(release_suffix_st).so \
- debian/tmp/usr/lib/libboost_regex$(release_suffix).a \
- debian/tmp/usr/lib/libboost_regex$(release_suffix).so
- dh_link -plibboost-regex-dev \
-@@ -272,6 +304,8 @@
- mv debian/libboost-dev/usr/include/boost/*serialization* \
- debian/libboost-serialization-dev/usr/include/boost
- dh_install -plibboost-serialization-dev --autodest \
-+ debian/tmp/usr/lib/libboost_serialization$(release_suffix_st).a \
-+ debian/tmp/usr/lib/libboost_wserialization$(release_suffix_st).a \
- debian/tmp/usr/lib/libboost_serialization$(release_suffix).a \
- debian/tmp/usr/lib/libboost_wserialization$(release_suffix).a
- dh_link -plibboost-serialization-dev \
-@@ -286,6 +320,10 @@
- debian/tmp/usr/lib/libboost_signals$(release_suffix).so.$(SOVERSION)
- dh_install -plibboost-dbg --autodest \
- debian/tmp/usr/lib/libboost_signals$(debug_suffix).so.$(SOVERSION)
-+ dh_install -plibboost-signals$(SOVERSION) --autodest \
-+ debian/tmp/usr/lib/libboost_signals$(release_suffix_st).so.$(SOVERSION)
-+ dh_install -plibboost-dbg --autodest \
-+ debian/tmp/usr/lib/libboost_signals$(debug_suffix_st).so.$(SOVERSION)
- dh_link -plibboost-dbg \
- usr/lib/libboost_signals$(debug_suffix).so.$(SOVERSION) \
- usr/lib/debug/usr/lib/libboost_signals$(release_suffix).so.$(SOVERSION)
-@@ -295,6 +333,8 @@
- mv debian/libboost-dev/usr/include/boost/*signal* \
- debian/libboost-signals-dev/usr/include/boost
- dh_install -plibboost-signals-dev --autodest \
-+ debian/tmp/usr/lib/libboost_signals$(release_suffix_st).a \
-+ debian/tmp/usr/lib/libboost_signals$(release_suffix_st).so \
- debian/tmp/usr/lib/libboost_signals$(release_suffix).a \
- debian/tmp/usr/lib/libboost_signals$(release_suffix).so
- dh_link -plibboost-signals-dev \
-@@ -306,10 +346,16 @@
-
- # package libboost-test$(SOVERSION)
- dh_install -plibboost-test$(SOVERSION) --autodest \
-+ debian/tmp/usr/lib/libboost_prg_exec_monitor$(release_suffix_st).so.$(SOVERSION) \
-+ debian/tmp/usr/lib/libboost_test_exec_monitor$(release_suffix_st).so.$(SOVERSION) \
-+ debian/tmp/usr/lib/libboost_unit_test_framework$(release_suffix_st).so.$(SOVERSION) \
- debian/tmp/usr/lib/libboost_prg_exec_monitor$(release_suffix).so.$(SOVERSION) \
- debian/tmp/usr/lib/libboost_test_exec_monitor$(release_suffix).so.$(SOVERSION) \
- debian/tmp/usr/lib/libboost_unit_test_framework$(release_suffix).so.$(SOVERSION)
- dh_install -plibboost-dbg --autodest \
-+ debian/tmp/usr/lib/libboost_prg_exec_monitor$(debug_suffix_st).so.$(SOVERSION) \
-+ debian/tmp/usr/lib/libboost_test_exec_monitor$(debug_suffix_st).so.$(SOVERSION) \
-+ debian/tmp/usr/lib/libboost_unit_test_framework$(debug_suffix_st).so.$(SOVERSION) \
- debian/tmp/usr/lib/libboost_prg_exec_monitor$(debug_suffix).so.$(SOVERSION) \
- debian/tmp/usr/lib/libboost_test_exec_monitor$(debug_suffix).so.$(SOVERSION) \
- debian/tmp/usr/lib/libboost_unit_test_framework$(debug_suffix).so.$(SOVERSION)
-@@ -326,6 +372,12 @@
- mv debian/libboost-dev/usr/include/boost/test \
- debian/libboost-test-dev/usr/include/boost
- dh_install -plibboost-test-dev --autodest \
-+ debian/tmp/usr/lib/libboost_prg_exec_monitor$(release_suffix_st).a \
-+ debian/tmp/usr/lib/libboost_prg_exec_monitor$(release_suffix_st).so \
-+ debian/tmp/usr/lib/libboost_test_exec_monitor$(release_suffix_st).a \
-+ debian/tmp/usr/lib/libboost_test_exec_monitor$(release_suffix_st).so \
-+ debian/tmp/usr/lib/libboost_unit_test_framework$(release_suffix_st).a \
-+ debian/tmp/usr/lib/libboost_unit_test_framework$(release_suffix_st).so \
- debian/tmp/usr/lib/libboost_prg_exec_monitor$(release_suffix).a \
- debian/tmp/usr/lib/libboost_prg_exec_monitor$(release_suffix).so \
- debian/tmp/usr/lib/libboost_test_exec_monitor$(release_suffix).a \
Deleted: boost/trunk/debian/patches/04-ublas_warnings.patch
===================================================================
--- boost/trunk/debian/patches/04-ublas_warnings.patch 2008-03-23 05:25:24 UTC (rev 14175)
+++ boost/trunk/debian/patches/04-ublas_warnings.patch 2008-03-23 05:32:27 UTC (rev 14176)
@@ -1,165 +0,0 @@
-Only in ./detail: semantic.cache
-diff -x CVS -u -r /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/functional.hpp ./functional.hpp
---- /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/functional.hpp 2005-07-14 15:05:27.000000000 +0200
-+++ ./functional.hpp 2005-10-28 10:03:19.136784304 +0200
-@@ -35,6 +35,7 @@
- #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
- #include <boost/numeric/bindings/atlas/cblas.hpp>
- #endif
-+#include <boost/concept_check.hpp>
-
-
-
-@@ -1390,6 +1391,7 @@
- size_type element (size_type i, size_type size1, size_type j, size_type size2) {
- BOOST_UBLAS_CHECK (i < size1, bad_index ());
- BOOST_UBLAS_CHECK (j < size2, bad_index ());
-+ ignore_unused_variable_warning(size1);
- // Guard against size_type overflow
- BOOST_UBLAS_CHECK (i <= ((std::numeric_limits<size_type>::max) () - j) / size2, bad_index ());
- return i * size2 + j;
-@@ -1399,6 +1401,7 @@
- size_type address (size_type i, size_type size1, size_type j, size_type size2) {
- BOOST_UBLAS_CHECK (i <= size1, bad_index ());
- BOOST_UBLAS_CHECK (j <= size2, bad_index ());
-+ ignore_unused_variable_warning(size1);
- // Guard against size_type overflow - address may be size2 past end of storage
- BOOST_UBLAS_CHECK (size2 == 0 || i <= ((std::numeric_limits<size_type>::max) () - j) / size2, bad_index ());
- return i * size2 + j;
-@@ -1479,24 +1482,28 @@
- BOOST_UBLAS_INLINE
- size_type element1 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
- BOOST_UBLAS_CHECK (i < size1, bad_index ());
-+ ignore_unused_variable_warning(size1);
- return i;
- }
- static
- BOOST_UBLAS_INLINE
- size_type element2 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
- BOOST_UBLAS_CHECK (j < size2, bad_index ());
-+ ignore_unused_variable_warning(size2);
- return j;
- }
- static
- BOOST_UBLAS_INLINE
- size_type address1 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
- BOOST_UBLAS_CHECK (i <= size1, bad_index ());
-+ ignore_unused_variable_warning(size1);
- return i;
- }
- static
- BOOST_UBLAS_INLINE
- size_type address2 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
- BOOST_UBLAS_CHECK (j <= size2, bad_index ());
-+ ignore_unused_variable_warning(size2);
- return j;
- }
- static
-@@ -1569,6 +1576,7 @@
- size_type element (size_type i, size_type size1, size_type j, size_type size2) {
- BOOST_UBLAS_CHECK (i < size1, bad_index ());
- BOOST_UBLAS_CHECK (j < size2, bad_index ());
-+ ignore_unused_variable_warning(size2);
- // Guard against size_type overflow
- BOOST_UBLAS_CHECK (j <= ((std::numeric_limits<size_type>::max) () - i) / size1, bad_index ());
- return i + j * size1;
-@@ -1578,6 +1586,7 @@
- size_type address (size_type i, size_type size1, size_type j, size_type size2) {
- BOOST_UBLAS_CHECK (i <= size1, bad_index ());
- BOOST_UBLAS_CHECK (j <= size2, bad_index ());
-+ ignore_unused_variable_warning(size2);
- // Guard against size_type overflow - address may be size1 past end of storage
- BOOST_UBLAS_CHECK (size1 == 0 || j <= ((std::numeric_limits<size_type>::max) () - i) / size1, bad_index ());
- return i + j * size1;
-@@ -1658,24 +1667,28 @@
- BOOST_UBLAS_INLINE
- size_type element1 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
- BOOST_UBLAS_CHECK (j < size2, bad_index ());
-+ ignore_unused_variable_warning(size2);
- return j;
- }
- static
- BOOST_UBLAS_INLINE
- size_type element2 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
- BOOST_UBLAS_CHECK (i < size1, bad_index ());
-+ ignore_unused_variable_warning(size1);
- return i;
- }
- static
- BOOST_UBLAS_INLINE
- size_type address1 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
- BOOST_UBLAS_CHECK (j <= size2, bad_index ());
-+ ignore_unused_variable_warning(size2);
- return j;
- }
- static
- BOOST_UBLAS_INLINE
- size_type address2 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
- BOOST_UBLAS_CHECK (i <= size1, bad_index ());
-+ ignore_unused_variable_warning(size1);
- return i;
- }
- static
-Only in .: matrix_expression.hpp~
-diff -x CVS -u -r /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/matrix.hpp ./matrix.hpp
---- /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/matrix.hpp 2005-08-25 11:13:05.000000000 +0200
-+++ ./matrix.hpp 2005-10-28 10:04:41.782220288 +0200
-@@ -2137,6 +2137,7 @@
- BOOST_UBLAS_INLINE
- bool operator == (const const_iterator1 &it) const {
- BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ());
-+ boost::ignore_unused_variable_warning(it);
- return true;
- }
- };
-@@ -2246,6 +2247,7 @@
- BOOST_UBLAS_INLINE
- bool operator == (const const_iterator2 &it) const {
- BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ());
-+ boost::ignore_unused_variable_warning(it);
- return true;
- }
- };
-Only in .: matrix_proxy.hpp~
-diff -x CVS -u -r /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/matrix_sparse.hpp ./matrix_sparse.hpp
---- /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/matrix_sparse.hpp 2005-10-25 20:13:14.322634920 +0200
-+++ ./matrix_sparse.hpp 2005-10-28 12:21:50.941197968 +0200
-@@ -17,6 +17,8 @@
- #ifndef _BOOST_UBLAS_MATRIX_SPARSE_
- #define _BOOST_UBLAS_MATRIX_SPARSE_
-
-+#include <boost/concept_check.hpp>
-+
- #include <boost/numeric/ublas/vector_sparse.hpp>
- #include <boost/numeric/ublas/matrix_expression.hpp>
- #include <boost/numeric/ublas/detail/matrix_assign.hpp>
-@@ -2677,6 +2679,7 @@
- void resize (size_type size1, size_type size2, bool preserve = true) {
- // FIXME preserve unimplemented
- BOOST_UBLAS_CHECK (!preserve, internal_logic ());
-+ boost::ignore_unused_variable_warning(preserve);
- size1_ = size1;
- size2_ = size2;
- capacity_ = restrict_capacity (capacity_);
-Only in .: matrix_sparse.hpp~
-Only in .: semantic.cache
-Only in .: semantic.cache~
-diff -x CVS -u -r /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/vector.hpp ./vector.hpp
---- /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/vector.hpp 2005-08-25 11:13:05.000000000 +0200
-+++ ./vector.hpp 2005-10-28 09:41:56.349797568 +0200
-@@ -20,6 +20,7 @@
- #include <boost/numeric/ublas/storage.hpp>
- #include <boost/numeric/ublas/vector_expression.hpp>
- #include <boost/numeric/ublas/detail/vector_assign.hpp>
-+#include <boost/concept_check.hpp>
-
- // Iterators based on ideas of Jeremy Siek
-
-@@ -702,6 +703,7 @@
- BOOST_UBLAS_INLINE
- bool operator == (const const_iterator &it) const {
- BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ());
-+ ignore_unused_variable_warning(it);
- return true;
- }
- };
Deleted: boost/trunk/debian/patches/05_regex_fixes.patch
===================================================================
--- boost/trunk/debian/patches/05_regex_fixes.patch 2008-03-23 05:25:24 UTC (rev 14175)
+++ boost/trunk/debian/patches/05_regex_fixes.patch 2008-03-23 05:32:27 UTC (rev 14176)
@@ -1,56 +0,0 @@
-diff -Naur ../unpatched/boost-1.34.1/boost/regex/v4/basic_regex_parser.hpp boost-1.34.1/boost/regex/v4/basic_regex_parser.hpp
---- ../unpatched/boost-1.34.1/boost/regex/v4/basic_regex_parser.hpp 2006-12-20 17:19:05.000000000 +0000
-+++ boost-1.34.1/boost/regex/v4/basic_regex_parser.hpp 2008-01-15 18:20:54.000000000 +0000
-@@ -777,6 +777,7 @@
- case syntax_element_restart_continue:
- case syntax_element_jump:
- case syntax_element_startmark:
-+ case syntax_element_backstep:
- // can't legally repeat any of the above:
- fail(regex_constants::error_badrepeat, m_position - m_base);
- return false;
-@@ -1862,6 +1863,7 @@
- if(markid == -4)
- {
- re_syntax_base* b = this->getaddress(expected_alt_point);
-+ // Make sure we have exactly one alternative following this state:
- if(b->type != syntax_element_alt)
- {
- re_alt* alt = static_cast<re_alt*>(this->insert_state(expected_alt_point, syntax_element_alt, sizeof(re_alt)));
-@@ -1872,6 +1874,15 @@
- fail(regex_constants::error_bad_pattern, m_position - m_base);
- return false;
- }
-+ // check for invalid repetition of next state:
-+ b = this->getaddress(expected_alt_point);
-+ b = this->getaddress(static_cast<re_alt*>(b)->next.i, b);
-+ if((b->type != syntax_element_assert_backref)
-+ && (b->type != syntax_element_startmark))
-+ {
-+ fail(regex_constants::error_badrepeat, m_position - m_base);
-+ return false;
-+ }
- }
- //
- // append closing parenthesis state:
-diff -Naur ../unpatched/boost-1.34.1/libs/regex/test/regress/test_perl_ex.cpp boost-1.34.1/libs/regex/test/regress/test_perl_ex.cpp
---- ../unpatched/boost-1.34.1/libs/regex/test/regress/test_perl_ex.cpp 2005-09-14 12:20:08.000000000 +0000
-+++ boost-1.34.1/libs/regex/test/regress/test_perl_ex.cpp 2008-01-15 18:20:54.000000000 +0000
-@@ -121,6 +121,17 @@
- TEST_INVALID_REGEX("(?:(a)|b)(?(?:", perl);
- TEST_INVALID_REGEX("(?:(a)|b)(?(?<", perl);
- TEST_INVALID_REGEX("(?:(a)|b)(?(?<a", perl);
-+
-+ TEST_INVALID_REGEX("(?(?!#?)+)", perl);
-+ TEST_INVALID_REGEX("(?(?=:-){0})", perl);
-+ TEST_INVALID_REGEX("(?(123){1})", perl);
-+ TEST_INVALID_REGEX("(?(?<=A)*)", perl);
-+ TEST_INVALID_REGEX("(?(?<=A)+)", perl);
-+
-+ TEST_INVALID_REGEX("(?<!*|^)", perl);
-+ TEST_INVALID_REGEX("(?<!*|A)", perl);
-+ TEST_INVALID_REGEX("(?<=?|A)", perl);
-+ TEST_INVALID_REGEX("(?<=*|\\B)", perl);
- }
-
- void test_options()
More information about the pkg-boost-commits
mailing list