[Python-modules-commits] r25453 - in packages/epsilon/trunk/debian (5 files)

[mithrandi at users.alioth.debian.org]

    Date: Friday, August 9, 2013 @ 13:05:37
  Author: mithrandi
Revision: 25453

Switch build system to dh/pybuild.debian/clean

Added:
  packages/epsilon/trunk/debian/python-epsilon.manpages
Modified:
  packages/epsilon/trunk/debian/compat
  packages/epsilon/trunk/debian/control
  packages/epsilon/trunk/debian/rules
  packages/epsilon/trunk/debian/runtrial.py

Modified: packages/epsilon/trunk/debian/compat
===================================================================
--- packages/epsilon/trunk/debian/compat	2013-08-09 10:02:07 UTC (rev 25452)
+++ packages/epsilon/trunk/debian/compat	2013-08-09 13:05:37 UTC (rev 25453)
@@ -1 +1 @@
-5
+9

Modified: packages/epsilon/trunk/debian/control
===================================================================
--- packages/epsilon/trunk/debian/control	2013-08-09 10:02:07 UTC (rev 25452)
+++ packages/epsilon/trunk/debian/control	2013-08-09 13:05:37 UTC (rev 25453)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Tristan Seligmann <mithrandi at debian.org>, Vincent Bernat <bernat at debian.org>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python, python-support (>= 0.4), quilt
+Build-Depends: debhelper (>= 9), python-all, quilt, dh-python
 Build-Depends-Indep: python-twisted-core, python-openssl, python-nevow, python-zopeinterface
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/epsilon/trunk/

Added: packages/epsilon/trunk/debian/python-epsilon.manpages
===================================================================
--- packages/epsilon/trunk/debian/python-epsilon.manpages	                        (rev 0)
+++ packages/epsilon/trunk/debian/python-epsilon.manpages	2013-08-09 13:05:37 UTC (rev 25453)
@@ -0,0 +1 @@
+debian/epsilon-benchmark.1

Modified: packages/epsilon/trunk/debian/rules
===================================================================
--- packages/epsilon/trunk/debian/rules	2013-08-09 10:02:07 UTC (rev 25452)
+++ packages/epsilon/trunk/debian/rules	2013-08-09 13:05:37 UTC (rev 25453)
@@ -1,19 +1,17 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = pysupport
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-PKGDIR=debian/python-epsilon
+export PYTHONDONTWRITEBYTECODE=yes
+export PYBUILD_DESTDIR_python2=debian/python-epsilon/
 
-DEB_INSTALL_MANPAGES_python-epsilon := debian/epsilon-benchmark.1
+%:
+	dh $@ --with quilt,python2 --buildsystem=pybuild
 
-install/python-epsilon::
-	rm $(PKGDIR)/usr/lib/python*/*-packages/epsilon/release.py
-	rm $(PKGDIR)/usr/lib/python*/*-packages/epsilon/test/test_release.py
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	$(call cdbs_python_binary,python$(cdbs_python_compile_version)) debian/runtrial.py $(PKGDIR) epsilon
-endif
-	mv $(PKGDIR)/usr/bin/benchmark $(PKGDIR)/usr/bin/epsilon-benchmark
+override_dh_auto_install:
+	dh_auto_install
+	mv debian/python-epsilon/usr/bin/benchmark debian/python-epsilon/usr/bin/epsilon-benchmark
 
-clean::
-	rm -rf _trial_temp
+override_dh_auto_test:
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="{interpreter} /usr/bin/trial epsilon" dh_auto_test
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS.txt

Modified: packages/epsilon/trunk/debian/runtrial.py
===================================================================
--- packages/epsilon/trunk/debian/runtrial.py	2013-08-09 10:02:07 UTC (rev 25452)
+++ packages/epsilon/trunk/debian/runtrial.py	2013-08-09 13:05:37 UTC (rev 25453)
@@ -9,8 +9,14 @@
 _path = sys.path[:]
 sys.path[:] = []
 addsitedir(join(root, site_packages[1:]))
-addsitedir(join(root, site_packages[1:].replace('dist-packages', 'site-packages'))) # cdbs installs python modules in site-packages even for Python 2.6
 sys.path.extend(_path)
 
+import os
+print os.getenv('PYTHONPATH')
+print sys.path
+import epsilon
+print epsilon.__file__
+assert False
+
 from twisted.scripts.trial import run
 run()