r1930 - in zope.testbrowser/trunk/debian (5 files)

[kobold at users.alioth.debian.org]

    Date: Tuesday, January 5, 2010 @ 19:40:36
  Author: kobold
Revision: 1930

Convert to debhelper 7 and the pydeb dh7 extension.

Modified:
  zope.testbrowser/trunk/debian/changelog
  zope.testbrowser/trunk/debian/compat
  zope.testbrowser/trunk/debian/control
  zope.testbrowser/trunk/debian/rules
  zope.testbrowser/trunk/debian/tests/all

Modified: zope.testbrowser/trunk/debian/changelog
===================================================================
--- zope.testbrowser/trunk/debian/changelog	2010-01-05 19:18:13 UTC (rev 1929)
+++ zope.testbrowser/trunk/debian/changelog	2010-01-05 19:40:36 UTC (rev 1930)
@@ -1,3 +1,9 @@
+zope.testbrowser (3.5.1-5) unstable; urgency=low
+
+  * Convert to debhelper 7 and the pydeb dh7 extension.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Tue, 05 Jan 2010 20:43:05 +0100
+
 zope.testbrowser (3.5.1-4) unstable; urgency=low
 
   * debian/control: build-depend on pyton-vab.pydeb >= 1.3.0-2.

Modified: zope.testbrowser/trunk/debian/compat
===================================================================
--- zope.testbrowser/trunk/debian/compat	2010-01-05 19:18:13 UTC (rev 1929)
+++ zope.testbrowser/trunk/debian/compat	2010-01-05 19:40:36 UTC (rev 1930)
@@ -1 +1 @@
-5
+7

Modified: zope.testbrowser/trunk/debian/control
===================================================================
--- zope.testbrowser/trunk/debian/control	2010-01-05 19:18:13 UTC (rev 1929)
+++ zope.testbrowser/trunk/debian/control	2010-01-05 19:40:36 UTC (rev 1930)
@@ -3,19 +3,20 @@
 Priority: extra
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <brian at vanguardistas.net>, Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-2)
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-4)
 Standards-Version: 3.8.3
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope.testbrowser/trunk
 
 Package: python-zope.testbrowser
 Architecture: all
-Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
-Suggests: ${setuptools:Suggests}
+Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
+Recommends: ${pydeb:Recommends}
+Provides: ${pydeb:Provides}, ${python:Provides}
+Suggests: ${pydeb:Suggests}
 Conflicts: zope3
 XB-Python-Version: ${python:Versions}
-Description: programmable browser for functional black-box tests
+Description: Programmable browser for functional black-box tests
  Provides an easy-to-use programmable web browser with special focus on
  testing. It is used in Zope, but it's not Zope specific at all. For
  instance, it can be used to test or otherwise interact with any web site.

Modified: zope.testbrowser/trunk/debian/rules
===================================================================
--- zope.testbrowser/trunk/debian/rules	2010-01-05 19:18:13 UTC (rev 1929)
+++ zope.testbrowser/trunk/debian/rules	2010-01-05 19:40:36 UTC (rev 1930)
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
+export PYDEB_SUGGESTS_EXTRAS="docs test"
 
-dependencies-python%:
-	(echo -n 'setuptools:Depends=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --exclude-extra test) >> debian/$(package).substvars
-	(echo -n 'setuptools:Provides=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --exclude-extra test) >> debian/$(package).substvars
-	# docs and test to suggests
-	(echo -n 'setuptools:Suggests=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --extra test) >> debian/$(package).substvars
+%:
+	dh --with pydeb --with python-central $@

Modified: zope.testbrowser/trunk/debian/tests/all
===================================================================
--- zope.testbrowser/trunk/debian/tests/all	2010-01-05 19:18:13 UTC (rev 1929)
+++ zope.testbrowser/trunk/debian/tests/all	2010-01-05 19:40:36 UTC (rev 1930)
@@ -1,27 +1,2 @@
 #!/bin/bash
-
-set -e
-
-PYVERS=$(pyversions -vr debian/control)
-TMPFILE=$(mktemp)
-
-cat > $TMPFILE << EOF
-import sys
-from zope.testing import testrunner
-
-subs = (sys.version_info[0], sys.version_info[1])
-test_path = '/usr/lib/python%s.%s/site-packages/' % subs
-
-
-
-exitcode = testrunner.run([
-                '--tests-pattern', '^f?tests$',
-                '-s', 'zope.testbrowser',
-                '--test-path', test_path
-                ])
-sys.exit(exitcode)
-EOF
-
-for version in ${PYVERS}; do
-    python${version} ${TMPFILE}
-done
+. /usr/share/python-zope.testing/test_helper