[taurus] 02/02: switch to pybuild

Frédéric-Emmanuel Picca picca at moszumanska.debian.org
Wed Feb 17 21:24:21 UTC 2016


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

picca pushed a commit to branch master
in repository taurus.

commit 550e641fe8280f071d6f56a61a922708cc907800
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Feb 17 20:48:17 2016 +0100

    switch to pybuild
---
 debian/changelog             |  7 +++++++
 debian/control               |  1 +
 debian/python-taurus.install |  3 ---
 debian/rules                 | 28 ++++++++++------------------
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4675c9b..1e6e837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+taurus (3.7.0+dfsg-1) unstable; urgency=medium
+
+  * Imported Upstream version 3.7.0+dfsg
+  * switch to pybuild
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Wed, 17 Feb 2016 18:43:26 +0100
+
 taurus (3.6.0+dfsg-1) unstable; urgency=medium
 
   * Imported Upstream version 3.6.0+dfsg
diff --git a/debian/control b/debian/control
index eb689f1..a0443b4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
 Section: science
 Priority: extra
 Build-Depends: debhelper (>= 9),
+               dh-python,
                graphviz,
                libqt4-dev,
                pymca,
diff --git a/debian/python-taurus.install b/debian/python-taurus.install
deleted file mode 100644
index 8e9eb66..0000000
--- a/debian/python-taurus.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/lib
-usr/share/man
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index b8c63d6..c01ae7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,12 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
-export HOME=$(CURDIR)/debian
+export PYBUILD_NAME=taurus
+export PYBUILD_BUILD_ARGS=--no-doc --with-extra-widgets
+export PYBUILD_INSTALL_ARGS=--skip-build --no-doc
 
-VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 
-# for backport on stable without bpo
-WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
-
-get-orig-source:
-	uscan --force-download --upstream-version $(VERSION)
+%:
+	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -23,12 +20,9 @@ override_dh_auto_clean:
 	rm -f lib/taurus/qt/qtgui/graphic/jdraw/jdraw_yacctab.py
 
 override_dh_auto_build:
-	dh_auto_build -- --no-doc --with-extra-widgets
-	xvfb-run -a python setup.py build_doc
-
-override_dh_auto_install:
-	dh_auto_install -- --skip-build --no-doc
-	dh_numpy
+	dh_auto_build
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' xvfb-run {interpreter} setup.py build_doc" dh_auto_build
 
 override_dh_installdocs:
 	dh_installdocs
@@ -36,8 +30,6 @@ override_dh_installdocs:
 	rdfind -outputname /dev/null -makesymlinks true debian/python-taurus-doc
 	# Fix those symlinks to make them relative
 	symlinks -r -s -c debian/python-taurus-doc
+	dh_numpy
 
-%:
-	dh $@ --with python2 $(WITH_SPHINXDOC)
-
-.PHONY: get-orig-source
+override_dh_auto_test:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/taurus.git



More information about the debian-science-commits mailing list