[pkg-boost-commits] r14540 - boost/trunk/debian

Steven Michael Robbins smr at alioth.debian.org
Tue Dec 15 06:01:17 UTC 2009 

Author: smr
Date: 2009-12-15 06:01:05 +0000 (Tue, 15 Dec 2009)
New Revision: 14540

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rtupdate
   boost/trunk/debian/rules
Log:
Remove hard-coded python versions.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2009-11-18 07:12:53 UTC (rev 14539)
+++ boost/trunk/debian/changelog	2009-12-15 06:01:05 UTC (rev 14540)
@@ -1,3 +1,13 @@
+boost1.40 (1.40.0-5) unstable; urgency=low
+
+  * control:
+  * rtupdate:
+  * rules: Remove hard-coded python versions (2.4 and 2.5).  Compute
+    supported python versions using "pyversions".  Thanks to Jakub Wilk
+    for the patch.  Closes: #556924.
+
+ -- Steve M. Robbins <smr at debian.org>  Tue, 15 Dec 2009 00:00:21 -0600
+
 boost1.40 (1.40.0-4) unstable; urgency=low
 
   * rtupdate: Don't die if link target doesn't exist.  Update of

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2009-11-18 07:12:53 UTC (rev 14539)
+++ boost/trunk/debian/control	2009-12-15 06:01:05 UTC (rev 14540)
@@ -6,7 +6,7 @@
 Uploaders: Steve M. Robbins <smr at debian.org>, Domenico Andreoli <cavok at debian.org>
 Build-Depends: debhelper (>= 7), quilt, bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6), mpi-default-dev
 Build-Conflicts: boost-build, libopenmpi-dev (= 1.3.2-2)
-XS-Python-Version: 2.4, 2.5
+XS-Python-Version: >= 2.4
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-boost/boost/trunk
 Standards-Version: 3.8.3

Modified: boost/trunk/debian/rtupdate
===================================================================
--- boost/trunk/debian/rtupdate	2009-11-18 07:12:53 UTC (rev 14539)
+++ boost/trunk/debian/rtupdate	2009-12-15 06:01:05 UTC (rev 14540)
@@ -17,9 +17,7 @@
     for base in libboost_python libboost_mpi_python; do
 	target=${base}-${py}.${suf}
 	link=${base}.${suf} 
-	if test -e $target ; then
-	    ln -s -f $target $link
-	fi
+  	test -e $target && ln -s -f $target $link || rm -f $link
     done
 }
 
@@ -35,8 +33,7 @@
 
 rtupdate() {
     case "$1" in
-	python2.4)  py=py24 ;;
-	python2.5)  py=py25 ;;
+	python*)  py=py`echo ${1#python} | tr -d .` ;;
 	*)          remove ; return ;;
     esac
 

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2009-11-18 07:12:53 UTC (rev 14539)
+++ boost/trunk/debian/rules	2009-12-15 06:01:05 UTC (rev 14540)
@@ -28,7 +28,7 @@
 boost_lib_test := prg_exec_monitor unit_test_framework
 
 # These are special cases for suffixes.  Generally come from --pythonid, so begin with a dash.
-boost_suffixes_python := -py24 -py25
+boost_suffixes_python := $(addprefix -py,$(subst .,,$(shell pyversions -rv)))
 boost_suffixes_mpi-python := $(boost_suffixes_python)
 
 # Files that are generated by filtering a template
@@ -142,7 +142,6 @@
 endif
 
 MPI_CONFIG = "using mpi ;"
-PYTHON_CONFIG1 = "using python : 2.4 : /usr ;"
 
 exampledir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/examples
 htmldir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/HTML
@@ -158,18 +157,20 @@
 user-config.jam:
 	echo $(TOOLSET_CONFIG) > $@
 	echo $(MPI_CONFIG)     >> $@
-	echo $(PYTHON_CONFIG1) >> $@
+	for pyver in $(filter-out $(shell pyversions -dv),$(shell pyversions -rv)); do \
+		echo "using python : $$pyver : /usr ;" >> $@; \
+	done
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN) $(bjam) user-config.jam
 	dh_testdir
 
 	$(JAM) --without-python                        
-	$(JAM) --with-python --with-mpi --pythonid=py24 python=2.4
-	# save mpi.so (pythonid is not (yet) used for the python module)
-	mv stage/lib/mpi.so stage/lib/mpi-py24.so
-	$(JAM) --with-python --with-mpi --pythonid=py25 python=2.5 
-	mv stage/lib/mpi.so stage/lib/mpi-py25.so
+	for pyver in $(shell pyversions -rv); do \
+	 	pyid=$$(echo $$pyver | tr -d .); \
+	 	$(JAM) --with-python --with-mpi --pythonid=py$$pyid python=$$pyver; \
+	 	mv stage/lib/mpi.so stage/lib/mpi-py$$pyid.so; \
+	done
 
 	cd tools/bcp && $(JAM)
 	cd tools/inspect/build && $(JAM)
@@ -224,8 +225,10 @@
 	@$(call cp_debhelper,libboost-mpi-python-dev,libboost-mpi-python$(PKGVERSION)-dev)
 
 	$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --without-python                        
-	$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --pythonid=py24 python=2.4 
-	$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --pythonid=py25 python=2.5 
+	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; \
+	done
 
 	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
 	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate
@@ -271,12 +274,12 @@
 
 	# package libboost-mpi-python$(SOVERSION)
 	dh_install -plibboost-mpi-python$(SOVERSION)
-	dh_install -plibboost-mpi-python$(SOVERSION) libs/mpi/build/__init__.py usr/lib/python2.4/site-packages/boost
-	dh_install -plibboost-mpi-python$(SOVERSION) libs/mpi/build/__init__.py usr/lib/python2.5/site-packages/boost
-	dh_installdirs -plibboost-mpi-python$(SOVERSION) usr/lib/python2.4/site-packages/boost
-	dh_installdirs -plibboost-mpi-python$(SOVERSION) usr/lib/python2.5/site-packages/boost
-	cp stage/lib/mpi-py24.so debian/libboost-mpi-python$(SOVERSION)/usr/lib/python2.4/site-packages/boost/mpi.so
-	cp stage/lib/mpi-py25.so debian/libboost-mpi-python$(SOVERSION)/usr/lib/python2.5/site-packages/boost/mpi.so
+	for pyver in $(shell pyversions -rv); do \
+		pyid=`echo $$pyver | tr -d .`; \
+		dh_install -plibboost-mpi-python$(SOVERSION) libs/mpi/build/__init__.py usr/lib/python$$pyver/site-packages/boost; \
+		dh_installdirs -plibboost-mpi-python$(SOVERSION) usr/lib/python$$pyver/site-packages/boost; \
+		cp stage/lib/mpi-py$$pyid.so debian/libboost-mpi-python$(SOVERSION)/usr/lib/python$$pyver/site-packages/boost/mpi.so; \
+	done
 	# package libboost-mpi-python$(PKGVERSION)-dev
 	dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
 	   debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate

More information about the pkg-boost-commits mailing list