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

[Steven Michael Robbins]

Author: smr
Date: 2010-07-04 10:33:56 +0000 (Sun, 04 Jul 2010)
New Revision: 14585

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/boost-python-examples.patch
Log:
Update boost-python-examples.patch to remove "-mt" suffix from libboost_python.  Also patch examples/tutorial/Jamroot.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2010-07-04 09:59:48 UTC (rev 14584)
+++ boost/trunk/debian/changelog	2010-07-04 10:33:56 UTC (rev 14585)
@@ -3,10 +3,14 @@
   * rules: Copy "doc" directories to $htmldir with --parents option so
     that they end up in the right place.  Closes: #586578.
   
-  * lambda-include-deps.patch: New.  Adapted from upstream changeset
-    61881.  Closes: #581706.
+  * patches/lambda-include-deps.patch: New.  Adapted from upstream
+    changeset 61881.  Closes: #581706.
+  
+  * patches/boost-python-examples.patch: Remove "-mt" suffix from
+    libboost_python.  Also patch examples/tutorial/Jamroot.  
+    Closes: #577793.
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 04 Jul 2010 04:59:10 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sun, 04 Jul 2010 05:32:56 -0500
 
 boost1.42 (1.42.0-3) unstable; urgency=low
 

Modified: boost/trunk/debian/patches/boost-python-examples.patch
===================================================================
--- boost/trunk/debian/patches/boost-python-examples.patch	2010-07-04 09:59:48 UTC (rev 14584)
+++ boost/trunk/debian/patches/boost-python-examples.patch	2010-07-04 10:33:56 UTC (rev 14585)
@@ -2,8 +2,8 @@
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452410#17
 
 
---- boost1.38-1.38.0.orig/libs/python/example/Jamroot
-+++ boost1.38-1.38.0/libs/python/example/Jamroot
+--- boost1.42-1.42.0.orig/libs/python/example/Jamroot
++++ boost1.42-1.42.0/libs/python/example/Jamroot
 @@ -2,16 +2,17 @@
  # Software License, Version 1.0. (See accompanying
  # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,7 +18,7 @@
 +# boost_python. That is, because the library was installed at the
 +# standard search path as /usr/lib/libboost_python.so, bjam will find
 +# it automatically. No need to specify the absolute path.
-+lib libboost_python : : <name>boost_python-mt ;
++lib libboost_python : : <name>boost_python ;
  
  # Set up the project-wide requirements that everything uses the
 -# boost_python library from the project whose global ID is
@@ -30,3 +30,25 @@
  
  # Declare the three extension modules.  You can specify multiple
  # source files after the colon separated by spaces.
+--- boost1.42-1.42.0.orig/libs/python/example/tutorial/Jamroot
++++ boost1.42-1.42.0/libs/python/example/tutorial/Jamroot
+@@ -11,16 +11,12 @@
+     using python ;
+ }
+ 
+-# Specify the path to the Boost project.  If you move this project,
+-# adjust this path to refer to the Boost root directory.
+-use-project boost
+-  : ../../../.. ;
++using python ;
+ 
+ # Set up the project-wide requirements that everything uses the
+-# boost_python library from the project whose global ID is
+-# /boost/python.
++# boost_python library.
+ project
+-  : requirements <library>/boost/python//boost_python ;
++  : requirements <library>libboost_python ;
+ 
+ # Declare the three extension modules.  You can specify multiple
+ # source files after the colon separated by spaces.