[Python-modules-commits] [billiard] 01/01: Cleanup debian/rules.

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository billiard.

commit b15dbf5a22beda553b92a102278081049ebcf8d8
Author: Brian May <bam at debian.org>
Date:   Fri Nov 6 08:51:11 2015 +1100

    Cleanup debian/rules.
---
 debian/changelog |  8 ++++++++
 debian/rules     | 47 +++--------------------------------------------
 2 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f694d4..0bacffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+billiard (3.3.0.20-3) UNRELEASED; urgency=medium
+
+  * Clean up debian/rules.
+  * Ensure Python3 tests run.
+  * Fix FTBFS error. Closes: #804137.
+
+ -- Brian May <bam at debian.org>  Fri, 06 Nov 2015 09:06:28 +1100
+
 billiard (3.3.0.20-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 56535f9..1fe2bad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,43 +1,14 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PYVERS :=  $(shell pyversions -r)
-PY3VERS := $(shell py3versions -r)
+export PYBUILD_NAME=billiard
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=python_distutils
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
-	set -e; \
-	for py in $(PYVERS) $(PY3VERS); do \
-		$$py -B setup.py build; \
-	done
+	dh_auto_build
 	PYTHONPATH=. sphinx-build -b html -N Doc/ Doc/.build/html
 
-override_dh_auto_clean:
-	set -e; \
-	for py in $(PYVERS) $(PY3VERS); do \
-		$$py -B setup.py clean; \
-		rm -rf build; \
-	done
-	find -name __pycache__ | xargs rm -rf
-	find -name "*.pyc" -delete
-
-override_dh_auto_install:
-	set -e; \
-	for py in $(PYVERS); do \
-		$$py -B setup.py install --skip-build --root debian/python-billiard \
-		                      --install-layout deb; \
-	done
-	set -e; \
-	for py in $(PY3VERS); do \
-		$$py -B setup.py install --skip-build --root debian/python3-billiard \
-		                      --install-layout deb; \
-	done
-	rm debian/python*-billiard/usr/lib/python*/*-packages/billiard*.egg-info/SOURCES.txt
-
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.txt
 
@@ -47,15 +18,3 @@ override_dh_compress:
 override_dh_clean:
 	dh_clean
 	rm -rf Doc/.build
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	# Test setup fails for python3.4, will be reenabled once the
-	# testsuite works again
-	set -e; \
-	for py in $(PYVERS); do \
-		$$py setup.py test ; \
-	done
-endif
-
-override_dh_sphinxdoc-arch:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/billiard.git