[Python-modules-commits] r18917 - in packages/python-docutils/trunk/debian (changelog rules)

[jwilk at users.alioth.debian.org]

    Date: Saturday, October 15, 2011 @ 00:31:58
  Author: jwilk
Revision: 18917

Use build/py2 and build/py3 for build directories.

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/rules

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-10-14 22:27:31 UTC (rev 18916)
+++ packages/python-docutils/trunk/debian/changelog	2011-10-15 00:31:58 UTC (rev 18917)
@@ -3,8 +3,9 @@
   * When running the test suite, don't copy stdout and stderr output to a log
     file, as this would break under LC_ALL=C, PYTHONWARNING=d and python3.X
     (testall-no-stdout-stderr-redirect.diff).
+  * Use build/py2 and build/py3 for build directories.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 18 Sep 2011 02:29:49 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 01:38:14 +0200
 
 python-docutils (0.8.1-3) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2011-10-14 22:27:31 UTC (rev 18916)
+++ packages/python-docutils/trunk/debian/rules	2011-10-15 00:31:58 UTC (rev 18917)
@@ -30,20 +30,17 @@
 		exit 1; \
 	fi
 	# Build modules for Python 2.X
-	python setup.py build
-	# Build modules for Python 3.X in a separate directory
-	rm -rf py3k
-	mkdir py3k
-	cp -rl docutils/ extras/ tools/ test/ setup.py py3k/
-	cd py3k && python3 setup.py build
+	python setup.py build --build-lib=build/py2/
+	# Build modules for Python 3.X
+	python3 setup.py build --build-lib=build/py3/
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	# Run test suite for Python 2.X:
-	set -ex && cd build/lib*/ && \
+	set -ex && cd build/py2/ && \
 	for python in $(shell pyversions -r); do \
 		$$python ../../test/alltests.py; \
 	done
 	# Run test suite for Python 3.X:
-	set -ex && cd py3k/build/lib*/ && \
+	set -ex && cd build/py3/ && \
 	for python in $(shell py3versions -r); do \
 		$$python test/alltests.py; \
 	done
@@ -63,7 +60,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	rm -rf build/ py3k/
+	rm -rf build/
 	find -name '*.py[co]' -delete
 	rm -f *.html
 	find docs -name '*.html' -not -name 'quickref.html' -delete
@@ -76,11 +73,11 @@
 	dh_testroot
 	dh_installdirs
 	mkdir -p debian/tmp
-	python setup.py install \
+	python setup.py build --build-lib=build/py2/ install \
 	    --root debian/tmp --no-compile $(py_setup_install_args) \
 	    --install-scripts=/usr/share/docutils/scripts/python2/
-	cd py3k && python3 setup.py install \
-	    --root ../debian/tmp --no-compile $(py_setup_install_args) \
+	python3 setup.py build --build-lib=build/py3/ install \
+	    --root debian/tmp --no-compile $(py_setup_install_args) \
 	    --install-scripts=/usr/share/docutils/scripts/python3/
 	# Move data files outside dist-packages:
 	mkdir -p debian/tmp/usr/share/