[Python-apps-commits] r10825 - in packages/testrepository/trunk/debian (changelog rules)

[mithrandi at users.alioth.debian.org]

    Date: Saturday, May 3, 2014 @ 15:08:34
  Author: mithrandi
Revision: 10825

Switch back to pybuild.

Modified:
  packages/testrepository/trunk/debian/changelog
  packages/testrepository/trunk/debian/rules

Modified: packages/testrepository/trunk/debian/changelog
===================================================================
--- packages/testrepository/trunk/debian/changelog	2014-05-03 14:22:14 UTC (rev 10824)
+++ packages/testrepository/trunk/debian/changelog	2014-05-03 15:08:34 UTC (rev 10825)
@@ -5,6 +5,7 @@
     - Thanks to Thorsten Alteholz for the bug report.
   * Upstream source has moved to github.
   * Switch to ASCII-armored upstream keyring in debian/upstream/.
+  * Switch back to pybuild.
 
  -- Tristan Seligmann <mithrandi at debian.org>  Sat, 03 May 2014 16:14:13 +0200
 

Modified: packages/testrepository/trunk/debian/rules
===================================================================
--- packages/testrepository/trunk/debian/rules	2014-05-03 14:22:14 UTC (rev 10824)
+++ packages/testrepository/trunk/debian/rules	2014-05-03 15:08:34 UTC (rev 10825)
@@ -1,50 +1,21 @@
 #!/usr/bin/make -f
 
-PYTHONS:=$(shell pyversions -vr)
-PYTHON3S:=$(shell py3versions -vr)
+export PYBUILD_NAME=testrepository
+export PYBUILD_DISABLE=test
 
 %:
-	dh $@ --with python2,python3 --buildsystem=python_distutils
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-override_dh_auto_test:
-	#./testr init
-	#set -e && for i in $(PYTHONS) $(PYTHON3S) ; do \
-	#	TEMP_REZ=`mktemp -t` && \
-	#	echo "===> Testing with Python $$i" ; \
-	#	PYTHON=python$$i ./testr run --parallel --subunit | tee $$TEMP_REZ | subunit2pyunit ; \
-	#	cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats || true ; \
-	#	rm -f $$TEMP_REZ ; \
-	#done
-	#./testr slowest
-
 override_dh_installchangelogs:
 	dh_installchangelogs -k NEWS
 
 override_dh_auto_install:
-	set -e && for pyvers in $(PYTHONS); do \
-		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/python-testrepository; \
-	done
+	dh_auto_install
 	mv $(CURDIR)/debian/python-testrepository/usr/bin/testr \
-		$(CURDIR)/debian/python-testrepository/usr/bin/testr-python2 \
-
-	set -e && for pyvers in $(PYTHON3S); do \
-		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/python3-testrepository; \
-	done
+		$(CURDIR)/debian/python-testrepository/usr/bin/testr-python2
 	mv $(CURDIR)/debian/python3-testrepository/usr/bin/testr \
 		$(CURDIR)/debian/python3-testrepository/usr/bin/testr-python3
 
 override_dh_clean:
-	dh_clean -O--buildsystem=python_distutils
+	dh_clean
 	rm -rf build .testrepository Makefile dist
-
-# Commands not to run
-override_dh_installcatalogs:
-override_dh_installemacsen override_dh_installifupdown:
-override_dh_installinfo override_dh_installmenu override_dh_installmime:
-override_dh_installmodules override_dh_installlogcheck:
-override_dh_installpam override_dh_installppp override_dh_installudev:
-override_dh_installwm:
-override_dh_installxfonts override_dh_gconf override_dh_icons:
-override_dh_usrlocal: