[Python-modules-commits] [cherrypy3] 01/08: Move help2man back to dh_auto_build instead of PYBUILD_BEFORE_BUILD

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository cherrypy3.

commit 0d592029ea126a05711c595ac0d9cf796b102ca0
Author: Carl Suster <carl at contraflo.ws>
Date:   Fri Jan 6 17:27:12 2017 +1100

    Move help2man back to dh_auto_build instead of PYBUILD_BEFORE_BUILD
---
 debian/rules | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 52d7e7f..8a212ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
 
-export PYBUILD_DESTDIR_python2=debian/python-cherrypy3/
-export PYBUILD_DESTDIR_python3=debian/python3-cherrypy3/
-
-export PYBUILD_BEFORE_BUILD_python2=PYTHONPATH=. help2man -n cherryd -s 1 -o debian/cherryd.1 --version-string=$(DEB_VERSION_UPSTREAM) ./cherrypy/cherryd
-export PYBUILD_BEFORE_BUILD_python3=PYTHONPATH=. help2man -n cherryd3 -s 1 -o debian/cherryd3.1 --version-string=$(DEB_VERSION_UPSTREAM) ./cherrypy/cherryd
+export PYBUILD_NAME=cherrypy3
 
 # export PYBUILD_DISABLE=test
 export PYBUILD_BEFORE_TEST=cp cherrypy/cherryd {build_dir}/cherrypy
@@ -18,6 +14,11 @@ export SETUPTOOLS_SCM_PRETEND_VERSION = $(DEB_VERSION_UPSTREAM)
 %:
 	dh $@ --buildsystem pybuild --with python2,python3,sphinxdoc
 
+override_dh_auto_build:
+	PYTHONPATH=. help2man -n cherryd -s 1 -o debian/cherryd.1 --version-string=$(DEB_VERSION_UPSTREAM) ./cherrypy/cherryd
+	PYTHONPATH=. help2man -n cherryd3 -s 1 -o debian/cherryd3.1 --version-string=$(DEB_VERSION_UPSTREAM) ./cherrypy/cherryd
+	dh_auto_build
+
 override_dh_install:
 	find debian/python*-cherrypy3/ -name LICENSE.md -exec rm {} \;
 	dh_install

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