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

[Steven Michael Robbins]

Author: smr
Date: 2010-01-03 23:56:37 +0000 (Sun, 03 Jan 2010)
New Revision: 14550

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/boost-build-pythonid.patch
   boost/trunk/debian/rules
Log:
Switch --pythonid to --xpythonid; c.f. https://svn.boost.org/trac/boost/ticket/3814

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2010-01-03 23:06:58 UTC (rev 14549)
+++ boost/trunk/debian/changelog	2010-01-03 23:56:37 UTC (rev 14550)
@@ -1,12 +1,16 @@
 boost1.41 (1.41.0-1) unstable; urgency=low
 
   * New upstream.
+
+  * patches/boost-build-pythonid.patch:
+  * rules: Switch --pythonid to --xpythonid;
+    c.f. https://svn.boost.org/trac/boost/ticket/3814
   
   * Merge changes from 1.40.0-5:
     - Switch to source format "3.0 (quilt)".
     - Remove hard-coding of python versions.
 
- -- Steve M. Robbins <smr at debian.org>  Mon, 21 Dec 2009 00:01:01 -0600
+ -- Steve M. Robbins <smr at debian.org>  Sun, 03 Jan 2010 17:23:55 -0600
 
 boost1.40 (1.40.0-4) unstable; urgency=low
 

Modified: boost/trunk/debian/patches/boost-build-pythonid.patch
===================================================================
--- boost/trunk/debian/patches/boost-build-pythonid.patch	2010-01-03 23:06:58 UTC (rev 14549)
+++ boost/trunk/debian/patches/boost-build-pythonid.patch	2010-01-03 23:56:37 UTC (rev 14550)
@@ -2,7 +2,7 @@
 Debian bug: #552014
 Reported upstream: https://svn.boost.org/trac/boost/ticket/3544
 
-Add --pythonid parameter to the build system to only add an identification 
+Add --xpythonid parameter to the build system to only add an identification 
 to Python libraries. The existing --buildid parameter adds an id to all 
 libraries and leads to uneccessary duplication of libraries if only the 
 Python version for the build is different.
@@ -14,7 +14,7 @@
  }
  
 +# Python build id (only for Python libraries)
-+local python-id = [ MATCH "^--pythonid=(.*)" : [ modules.peek : ARGV ] ] ;
++local python-id = [ MATCH "^--xpythonid=(.*)" : [ modules.peek : ARGV ] ] ;
 +if $(python-id)
 +{
 +    constant PYTHON_ID : [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2010-01-03 23:06:58 UTC (rev 14549)
+++ boost/trunk/debian/rules	2010-01-03 23:56:37 UTC (rev 14550)
@@ -25,7 +25,7 @@
 boost_lib_serialization := serialization wserialization
 boost_lib_test := prg_exec_monitor unit_test_framework
 
-# These are special cases for suffixes.  Generally come from --pythonid, so begin with a dash.
+# These are special cases for suffixes.  Generally come from --xpythonid, so begin with a dash.
 boost_suffixes_python := $(addprefix -py,$(subst .,,$(shell pyversions -rv)))
 boost_suffixes_mpi-python := $(boost_suffixes_python)
 
@@ -167,7 +167,7 @@
 	for pyver in $(shell pyversions -rv); do \
 	 	pyid=$$(echo $$pyver | tr -d .); \
 		echo "Building Boost.Python for python version $pyver"; \
-	 	$(JAM) --with-python --with-mpi --pythonid=py$$pyid python=$$pyver; \
+	 	$(JAM) --with-python --with-mpi --xpythonid=py$$pyid python=$$pyver; \
 	 	mv stage/lib/mpi.so stage/lib/mpi-py$$pyid.so; \
 	done
 
@@ -226,7 +226,7 @@
 	$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --without-python                        
 	for pyver in $(shell pyversions -rv); do \
 		pyid=`echo $$pyver | tr -d .`; \
-		$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --pythonid=py$$pyid python=$$pyver; \
+		$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --xpythonid=py$$pyid python=$$pyver; \
 	done
 
 	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate