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

[Steven Michael Robbins]

Author: smr
Date: 2010-12-14 05:47:43 +0000 (Tue, 14 Dec 2010)
New Revision: 14606

Removed:
   boost/trunk/debian/patches/boost-build-pythonid.patch
   boost/trunk/debian/patches/kfreebsd-jam.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Remove patches applied upstream.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2010-12-14 05:33:38 UTC (rev 14605)
+++ boost/trunk/debian/changelog	2010-12-14 05:47:43 UTC (rev 14606)
@@ -1,3 +1,11 @@
+boost1.45 (1.45.0-1) experimental; urgency=low
+
+  * New upstream.
+    - patches/kfreebsd-jam.patch: Remove.  Applied upstream.
+    - patches/boost-build-pythonid.patch: Remove.  Applied upstream.
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 13 Dec 2010 23:39:59 -0600
+
 boost1.44 (1.44.0-2) experimental; urgency=low
 
   * rules, control: Build Python extensions for Python 3 in addition to

Deleted: boost/trunk/debian/patches/boost-build-pythonid.patch
===================================================================
--- boost/trunk/debian/patches/boost-build-pythonid.patch	2010-12-14 05:33:38 UTC (rev 14605)
+++ boost/trunk/debian/patches/boost-build-pythonid.patch	2010-12-14 05:47:43 UTC (rev 14606)
@@ -1,48 +0,0 @@
-Patch from Gaudenz Steinlin <gaudenz at debian.org>
-Debian bug: #552014
-Reported upstream: https://svn.boost.org/trac/boost/ticket/3544
-
-The upstream bug was supposed to have been fixed in Changeset 59987
-https://svn.boost.org/trac/boost/changeset/59987 on 2010-02-28 but
-Boost 1.44 was released with part of the patch missing.  This 
-abridged patch is that missing piece: add the tag to mpi python
-libraries.
-
---- boost_1_41_0.orig/libs/mpi/build/Jamfile.v2
-+++ boost_1_41_0/libs/mpi/build/Jamfile.v2
-@@ -9,6 +9,7 @@
- #           Andrew Lumsdaine
- 
- import mpi ;
-+import indirect ;
- import python ;
- 
- libraries = ;
-@@ -18,8 +19,27 @@
- 
- project boost/mpi
-   : source-location ../src
-+  : requirements
-+    -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-+    <tag>@$(__name__).tag
-   ;
- 
-+rule tag ( name : type ? : property-set )
-+{
-+    local result = $(name) ;
-+    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
-+    {
-+        if $(name) = boost_mpi_python && $(PYTHON_ID)
-+        {
-+            result = $(result)-$(PYTHON_ID) ;
-+        }
-+    }
-+    
-+    # forward to the boost tagging rule
-+    return  [ indirect.call $(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag 
-+                $(result) : $(type) : $(property-set) ] ;
-+}
-+
- lib boost_mpi 
-   : 
-     broadcast.cpp

Deleted: boost/trunk/debian/patches/kfreebsd-jam.patch
===================================================================
--- boost/trunk/debian/patches/kfreebsd-jam.patch	2010-12-14 05:33:38 UTC (rev 14605)
+++ boost/trunk/debian/patches/kfreebsd-jam.patch	2010-12-14 05:47:43 UTC (rev 14606)
@@ -1,15 +0,0 @@
-Reported upstream as https://svn.boost.org/trac/boost/ticket/2596
-
---- boost1.38-1.38.0.orig/tools/jam/src/jam.h
-+++ boost1.38-1.38.0/tools/jam/src/jam.h
-@@ -419,6 +419,10 @@
-     #include <stdlib.h>
- #endif
- 
-+#ifdef __GLIBC__
-+#  include <unistd.h>
-+#endif
-+
- #if !defined( OS_BSDI         ) && \
-     !defined( OS_FREEBSD      ) && \
-     !defined( OS_DRAGONFLYBSD ) && \

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2010-12-14 05:33:38 UTC (rev 14605)
+++ boost/trunk/debian/patches/series	2010-12-14 05:47:43 UTC (rev 14606)
@@ -1,11 +1,9 @@
 mips-asm.patch
 boost-python-examples.patch
 endian.patch
-kfreebsd-jam.patch
 python2.5-elementtree.patch
 date_time_date_formatting_hpp.patch
 sh4.patch
-boost-build-pythonid.patch
 hurd-ellint_rd.patch
 hurd-execution_monitor.patch
 kfreebsd-thread.patch