[Python-modules-commits] r27885 - in packages/python-bitarray/trunk/debian (4 files)

[jandd at users.alioth.debian.org]

    Date: Saturday, February 22, 2014 @ 18:07:02
  Author: jandd
Revision: 27885

merged pybuild branch

Modified:
  packages/python-bitarray/trunk/debian/changelog
  packages/python-bitarray/trunk/debian/compat
  packages/python-bitarray/trunk/debian/control
  packages/python-bitarray/trunk/debian/rules

Modified: packages/python-bitarray/trunk/debian/changelog
===================================================================
--- packages/python-bitarray/trunk/debian/changelog	2014-02-22 18:01:58 UTC (rev 27884)
+++ packages/python-bitarray/trunk/debian/changelog	2014-02-22 18:07:02 UTC (rev 27885)
@@ -7,6 +7,15 @@
   * New upstream version
   * run wrap-and-sort (affects debian/control and debian/copyright)
   * debian/control: bump Standards-Version to 3.9.5
+  * switch to pybuild
+    - add dh-python, python-setuptools and python3-setuptools to Build-
+      Depends
+    - use python-all instead of python in Build-Depends
+    - switch to debhelper (>= 9)
+    - add X-Python-Version and X-Python3-Version to source package stanza
+    - drop custom rules from debian/rules, add PYBUILD_NAME and
+      --buildsystem=pybuild
+    - add override_dh_auto_test to tell pybuild about the custom test system
 
  -- Jan Dittberner <jandd at debian.org>  Sat, 22 Feb 2014 16:48:07 +0100
 

Modified: packages/python-bitarray/trunk/debian/compat
===================================================================
--- packages/python-bitarray/trunk/debian/compat	2014-02-22 18:01:58 UTC (rev 27884)
+++ packages/python-bitarray/trunk/debian/compat	2014-02-22 18:07:02 UTC (rev 27885)
@@ -1 +1 @@
-7
+9

Modified: packages/python-bitarray/trunk/debian/control
===================================================================
--- packages/python-bitarray/trunk/debian/control	2014-02-22 18:01:58 UTC (rev 27884)
+++ packages/python-bitarray/trunk/debian/control	2014-02-22 18:07:02 UTC (rev 27885)
@@ -3,14 +3,19 @@
 Priority: optional
 Maintainer: Jan Dittberner <jandd at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
+               dh-python,
                dpkg-dev (>= 1.16.1~),
-               python (>= 2.6.6-3~),
+               python-all (>= 2.6.6-3~),
                python-all-dev,
                python-docutils,
-               python3 (>= 3.1.3-2~),
-               python3-all-dev
+               python-setuptools,
+               python3-all,
+               python3-all-dev,
+               python3-setuptools
 Standards-Version: 3.9.5
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 Homepage: http://pypi.python.org/pypi/bitarray
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-bitarray/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-bitarray/trunk/

Modified: packages/python-bitarray/trunk/debian/rules
===================================================================
--- packages/python-bitarray/trunk/debian/rules	2014-02-22 18:01:58 UTC (rev 27884)
+++ packages/python-bitarray/trunk/debian/rules	2014-02-22 18:07:02 UTC (rev 27885)
@@ -1,33 +1,19 @@
 #!/usr/bin/make -f
 
+#export DH_VERBOSE=1
+export PYBUILD_NAME=bitarray
+
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/python/python.mk
 
 DOCTEMPDIR=$(CURDIR)/debian/buildhtml
 DEFAULTPYTHON=$(shell pyversions -d)
-PYVERS=$(shell pyversions -i)
-PY3VERS=$(shell py3versions -i)
 
 override_dh_auto_clean:
 	rm -rf $(DOCTEMPDIR) README.html build
+	dh_auto_clean
 
-override_dh_auto_build:
-	for pyvers in $(PYVERS) $(PY3VERS); do \
-	    $$pyvers setup.py build; \
-	done
-
-run-install%:
-	$* setup.py install --install-layout=deb --root $(CURDIR)/$(call py_pkgname,debian/python-bitarray,$*)
-
-override_dh_auto_install: $(PYVERS:%=run-install%) $(PY3VERS:%=run-install%)
-
-override_dh_python2:
-	dh_python2 -ppython-bitarray
-
-override_dh_python3:
-	dh_python3 -ppython3-bitarray
-
 override_dh_installdocs:
 	mkdir $(DOCTEMPDIR); \
 	sed 's,rst2html\.py,rst2html,' <$(CURDIR)/update_readme.py >$(DOCTEMPDIR)/update_readme.py; \
@@ -41,15 +27,9 @@
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGE_LOG
 
-run-test%:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-		set -e -x; \
-		# move to debian dir to avoid import conflict
-		cd $(CURDIR)/debian; \
-		PYTHONPATH=$(CURDIR)/$(call py_builddir, $(shell echo $*)) $* -c 'import bitarray; bitarray.test()'
-endif
+override_dh_auto_test:
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="cd {build_dir}; {interpreter} -c 'import bitarray; bitarray.test()'" dh_auto_test
 
-override_dh_auto_test: $(PYVERS:%=run-test%) $(PY3VERS:%=run-test%)
-
 %:
-	dh --with python2,python3 $@ --buildsystem=python_distutils
+	dh $@ --with python2,python3 --buildsystem=pybuild