[Python-modules-commits] [python-fudge] 06/15: Switch to dh-python/pybuild

[Jan Dittberner]

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

jandd pushed a commit to branch master
in repository python-fudge.

commit c4a0723cb24549db6cd619b7d124887abce20ffc
Author: Jan Dittberner <jandd at debian.org>
Date:   Wed Dec 30 15:32:17 2015 +0100

    Switch to dh-python/pybuild
    
    * Run wrap-and-sort
    * Switch to dh-python/pybuild
---
 debian/changelog |  4 +++-
 debian/compat    |  2 +-
 debian/control   | 20 +++++++++++++-------
 debian/rules     | 29 +++++++----------------------
 4 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b15666..16ad0b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,9 +9,11 @@ python-fudge (1.0.3-4) UNRELEASED; urgency=low
   * Apply patch by Juan Picca to have fixed timestamps to make the build
     reproducible (Closes: #788501)
   * Bump Standards-Version to 3.9.6 (no changes)
+  * Run wrap-and-sort
+  * Switch to dh-python/pybuild
   * Update copyright years
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:37 +0200
+ -- Jan Dittberner <jandd at debian.org>  Wed, 30 Dec 2015 15:39:57 +0100
 
 python-fudge (1.0.3-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 2e46b42..08901ca 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,24 @@ Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Jan Dittberner <jandd at debian.org>
-Build-Depends: debhelper (>= 8~), python (>= 2.6.5~), python3 (>=
- 3.1.3-2~), python-setuptools, python3-setuptools, python-nose,
- python-sphinx (>= 1.0.7+dfsg-1~)
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python-all,
+               python-nose,
+               python-setuptools,
+               python-sphinx | python3-sphinx,
+               python3-all,
+               python3-setuptools
 Standards-Version: 3.9.6
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.4
 Homepage: http://farmdev.com/projects/fudge/
 Vcs-Git: git://anonscm.debian.org/python-modules/packages/python-fudge.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-fudge.git
 
 Package: python-fudge
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
 Recommends: python-fudge-doc (=${binary:Version})
 Description: Python 2 module for using fake objects for tests
  Fudge is a Python module for using fake objects (mocks and stubs) to
@@ -40,7 +46,7 @@ Description: Python 2 module for using fake objects for tests
 Package: python-fudge-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}, libjs-sphinxdoc
+Depends: libjs-sphinxdoc, ${misc:Depends}, ${sphinxdoc:Depends}
 Description: Python module for using fake objects for tests, documentation package
  Fudge is a Python module for using fake objects (mocks and stubs) to
  test real ones.
@@ -64,7 +70,7 @@ Description: Python module for using fake objects for tests, documentation packa
 
 Package: python3-fudge
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources
+Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
 Recommends: python-fudge-doc (=${binary:Version})
 Description: Python 3 module for using fake objects for tests
  Fudge is a Python module for using fake objects (mocks and stubs) to
diff --git a/debian/rules b/debian/rules
index 22a887a..6ba4186 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,18 @@
 #!/usr/bin/make -f
 
+#DH_VERBOSE=1
+
+export PYBUILD_NAME=fudge
+export PYBUILD_DISABLE_python3=test
+
 LAST_CHANGE = $(shell dpkg-parsechangelog -S Date)
 BUILD_DATE  = $(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
 SPHINXOPTS := -D html_last_updated_fmt="$(BUILD_DATE)"
 
-override_dh_auto_clean:
-	rm -rf build fudge.egg-info
-	find -name '._*' -delete
-	dh_auto_clean
-
 override_dh_auto_install:
 	sphinx-build $(SPHINXOPTS) -b html -a -c docs docs \
 		$(CURDIR)/debian/python-fudge-doc/usr/share/doc/python-fudge-doc/html
-	python setup.py install --install-layout=deb \
-	    --root $(CURDIR)/debian/python-fudge
-	python3 setup.py install --install-layout=deb \
-		--root $(CURDIR)/debian/python3-fudge
-
-override_dh_python2:
-	dh_python2 -ppython-fudge
-
-override_dh_python3:
-	dh_python3 -ppython3-fudge
+	dh_auto_install
 
 override_dh_sphinxdoc:
 	dh_sphinxdoc -ppython-fudge-doc
@@ -29,11 +20,5 @@ override_dh_sphinxdoc:
 override_dh_compress:
 	dh_compress -i -X.rst -X.js -X.html -X.txt
 
-override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-		set -e -x; \
-		PYTHONPATH=$(CURDIR)/build/lib.* python setup.py nosetests
-endif
-
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=python_distutils
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild

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