[Python-modules-commits] r28859 - in packages/moksha.hub/trunk/debian (changelog control rules)

[olasd at users.alioth.debian.org]

    Date: Sunday, May 11, 2014 @ 15:46:50
  Author: olasd
Revision: 28859

Switch buildsystem to pybuild

Modified:
  packages/moksha.hub/trunk/debian/changelog
  packages/moksha.hub/trunk/debian/control
  packages/moksha.hub/trunk/debian/rules

Modified: packages/moksha.hub/trunk/debian/changelog
===================================================================
--- packages/moksha.hub/trunk/debian/changelog	2014-05-11 15:35:42 UTC (rev 28858)
+++ packages/moksha.hub/trunk/debian/changelog	2014-05-11 15:46:50 UTC (rev 28859)
@@ -3,6 +3,7 @@
   * New upstream release
     - Refresh patches
   * Add explicit (build-)dependency on python-six
+  * Switch buildsystem to pybuild
 
  -- Nicolas Dandrimont <olasd at debian.org>  Sun, 11 May 2014 16:50:42 +0200
 

Modified: packages/moksha.hub/trunk/debian/control
===================================================================
--- packages/moksha.hub/trunk/debian/control	2014-05-11 15:35:42 UTC (rev 28858)
+++ packages/moksha.hub/trunk/debian/control	2014-05-11 15:46:50 UTC (rev 28859)
@@ -5,6 +5,7 @@
 Uploaders: Simon Chopin <chopin.simon at gmail.com>, Nicolas Dandrimont <olasd at debian.org>
 Build-Depends:
  debhelper (>= 9),
+ dh-python,
  python-all (>= 2.6.6-3~),
  python-daemon,
  python-mock,

Modified: packages/moksha.hub/trunk/debian/rules
===================================================================
--- packages/moksha.hub/trunk/debian/rules	2014-05-11 15:35:42 UTC (rev 28858)
+++ packages/moksha.hub/trunk/debian/rules	2014-05-11 15:46:50 UTC (rev 28859)
@@ -1,20 +1,12 @@
 #!/usr/bin/make -f
 
-PY2VERS = $(shell pyversions -vr)
-
-export http_proxy = http://127.0.9.1:9
-export https_proxy = http://127.0.9.1:9
-
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_install:
 	dh_install
 	rm -f debian/python-moksha.hub/usr/lib/python*/dist-packages/moksha.hub-*.egg-info/SOURCES.txt
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	set -e; for py in $(PY2VERS); do \
-		python$$py setup.py test; \
-	done
-endif
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="cp development.ini {build_dir}; cd {build_dir}; python{version} -m nose -v" dh_auto_test