Merge lp:~verterok/ubuntu/oneiric/protobuf/build_for_2_6 into lp:ubuntu/oneiric/protobuf

[Guillermo Gonzalez]

Fix debian/rules to build python-protobuf for all supported python versions (2.6 and 2.7)

This branch fixes debian/rules to build python-protobuf for all supported python versions (2.6 and 2.7)

[Stéphane Graber (stgraber)]

Looks good. Uploaded to -proposed.

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-11 16:33:47 +0000
+++ debian/changelog	2011-12-08 01:48:27 +0000
@@ -1,3 +1,10 @@
+protobuf (2.4.0a-2ubuntu3) oneiric-proposed; urgency=low
+
+  * Fix build of python bindings for multiple versions (2.6 and 2.7) 
+    (LP: #900941)
+
+ -- Guillermo Gonzalez <[e-mail]>  Tue, 06 Dec 2011 18:24:14 -0300
+
 protobuf (2.4.0a-2ubuntu2) oneiric; urgency=low
 
   * Switch to dh_python2.  (LP: #788514)
 
=== modified file 'debian/rules'
--- debian/rules	2011-08-11 16:33:13 +0000
+++ debian/rules	2011-12-08 01:48:27 +0000
@@ -44,6 +44,9 @@
 version=0.0.0
 major=0
 
+
+PYVERS = $(shell pyversions --requested --version debian/control)
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -68,16 +71,19 @@
 
 	# python bindings
 	cd python && \
-	  PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp python setup.py build
+	for pyver in $(PYVERS); do \
+		PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp python$(pyver) setup.py build;\
+	done
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	# run tests via pure-python
-	cd python && \
-	  PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python python setup.py test
-	# run tests via the CPP implementation
-	cd python && \
-	  PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp python setup.py test
+	# run tests via pure-python and the CPP implementation
+	cd python && \
+	for pyver in $(PYVERS); do \
+		PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python python$(pyver) setup.py test; \
+		PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp python$(pyver) setup.py test; \
+	done
 endif
+	
 
 	# build the protoc manpage
 	xmlto man debian/protoc.xml
@@ -105,7 +111,10 @@
 	rm -f protoc.1
 
 	# Python bindings cleanups
-	cd python && python setup.py clean --all
+	cd python && \
+	for pyver in $(PYVERS); do \
+		python$(pyver) setup.py clean --all; \
+	done
 	rm -rf python/protobuf.egg-info
 
 	# Java bindings cleanups
@@ -145,13 +154,16 @@
 	rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/include/google/protobuf/compiler
 
 	# python bindings
-	cd python && PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp \
-	  python setup.py install --no-compile \
-	    --root=$(CURDIR)/debian/python-protobuf \
-	    --install-layout=deb ; \
-	  find $(CURDIR)/debian/python-protobuf \
-	    -name 'protobuf-*-nspkg.pth' -print0 | \
-	  xargs -r0 rm -f
+	cd python && \
+	for pyver in $(PYVERS); do \
+		PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp \
+		  python$(pyver) setup.py install --no-compile \
+		    --root=$(CURDIR)/debian/python-protobuf \
+	    	--install-layout=deb ; \
+		  find $(CURDIR)/debian/python-protobuf \
+		    -name 'protobuf-*-nspkg.pth' -print0 | \
+		  xargs -r0 rm -f; \
+	done
 	# cleanup RPATH from built bindings
 	find $(CURDIR)/debian/python-protobuf -name '*.so' -print0 | \
 	  xargs -r0 chrpath -d