[Python-modules-commits] [speaklater] 03/10: use dh-python and pybuild

[Jan Dittberner]

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

jandd pushed a commit to branch master
in repository speaklater.

commit 8e8cf86c5ecb3e822375ac3a39a65fdb86e8305f
Author: Jan Dittberner <jandd at debian.org>
Date:   Fri Nov 13 17:40:54 2015 +0100

    use dh-python and pybuild
---
 debian/changelog                 |  1 +
 debian/control                   |  1 +
 debian/python-speaklater.install |  1 -
 debian/rules                     | 22 +++++++---------------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0202e35..b0ca7f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ speaklater (1.3-3) UNRELEASED; urgency=medium
   * Team upload.
   * Add Python3 support
   * Bump Standards-Version (no changes)
+  * use dh-python and pybuild
 
  -- Jan Dittberner <jandd at debian.org>  Fri, 13 Nov 2015 17:24:29 +0100
 
diff --git a/debian/control b/debian/control
index 99b4973..aefbe00 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sebastian Ramacher <sramacher at debian.org>
 Build-Depends: debhelper (>= 9),
+               dh-python,
                python-all (>= 2.6.6-6~),
                python-epydoc,
                python-setuptools,
diff --git a/debian/python-speaklater.install b/debian/python-speaklater.install
deleted file mode 100644
index 2655300..0000000
--- a/debian/python-speaklater.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2.*
diff --git a/debian/rules b/debian/rules
index cb28bba..e68ed43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,14 @@
 #!/usr/bin/make -f
 
-# Supported Python versions
-PYVERS = $(shell pyversions -vr)
-
-# Callable functions to determine the correct PYTHONPATH
-pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
+export PYBUILD_DESTDIR_python2=debian/python-speaklater
+export PYBUILD_DESTDIR_python3=debian/python3-speaklater
 
 %:
-	dh $@ --with=python2,python3
+	dh $@ --with python2,python3 --buildsystem pybuild
 
-override_dh_auto_build:
-	dh_auto_build
-	PYTHONPATH=$(call pythonpath,$$py) epydoc speaklater
+override_dh_installdocs:
+	PYTHONPATH=. epydoc speaklater
+	dh_installdocs
 
 override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	set -ex && for py in $(PYVERS); do \
-		PYTHONPATH=$(call pythonpath,$$py) python$$py -m speaklater ;\
-	done
-endif
-
+	PYBUILD_SYSTEM=custom PYBUILD_TEST_ARGS='set -ex && {interpreter} -m speaklater' dh_auto_test

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