[Python-modules-commits] [python-ws4py] 12/20: Migrate to pybuild

[Stein Magnus Jodal]

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

jodal pushed a commit to branch master
in repository python-ws4py.

commit 22ab92666a00b182852c8e216b9ec76047dac470
Author: Stein Magnus Jodal <jodal at debian.org>
Date:   Thu Nov 5 12:37:40 2015 +0100

    Migrate to pybuild
---
 debian/changelog             |  2 ++
 debian/python-ws4py.docs     |  2 +-
 debian/python-ws4py.install  |  1 -
 debian/python3-ws4py.docs    |  2 +-
 debian/python3-ws4py.install |  1 -
 debian/rules                 | 30 ++++--------------------------
 6 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a068650..cb198db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ python-ws4py (0.3.4-2) UNRELEASED; urgency=medium
   * debian/copyright
     - Update my email address
     - Update copyright for 2015
+  * debian/rules
+    - Migrate to pybuild
   * debian/watch
     - Update to use pypi.debian.net
 
diff --git a/debian/python-ws4py.docs b/debian/python-ws4py.docs
index 5ff3dd5..76e8112 100644
--- a/debian/python-ws4py.docs
+++ b/debian/python-ws4py.docs
@@ -1,2 +1,2 @@
 README.md
-build/sphinx/html
+docs/_build/html/
diff --git a/debian/python-ws4py.install b/debian/python-ws4py.install
deleted file mode 100644
index b2cc136..0000000
--- a/debian/python-ws4py.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2*
diff --git a/debian/python3-ws4py.docs b/debian/python3-ws4py.docs
index 5ff3dd5..76e8112 100644
--- a/debian/python3-ws4py.docs
+++ b/debian/python3-ws4py.docs
@@ -1,2 +1,2 @@
 README.md
-build/sphinx/html
+docs/_build/html/
diff --git a/debian/python3-ws4py.install b/debian/python3-ws4py.install
deleted file mode 100644
index b06a399..0000000
--- a/debian/python3-ws4py.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3
diff --git a/debian/rules b/debian/rules
index 3afde72..30e7022 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,40 +3,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
+export PYBUILD_NAME=ws4py
 
 %:
-	dh $@ --with python2,python3,sphinxdoc
-
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-test-python%:
-	python$* setup.py test -vv
-
-# Test suite depends on optional dependencies that isn't available on Py3
-#override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
-override_dh_auto_test: $(PYTHON2:%=test-python%)
-endif
-
-build-python%:
-	python$* setup.py build
-
-override_dh_auto_build: $(PYTHON3:%=build-python%)
-	dh_auto_build
-
-install-python%:
-	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
-
-override_dh_auto_install: $(PYTHON3:%=install-python%)
-	dh_auto_install
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.txt
 
 override_dh_installdocs:
-	python setup.py build_sphinx
+	make -C docs/ clean html
 	dh_installdocs
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf build
+	make -C docs/ clean

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