r1925 - in zope.copy/trunk/debian (changelog control rules tests/all)

[kobold at users.alioth.debian.org]

    Date: Wednesday, December 30, 2009 @ 18:45:23
  Author: kobold
Revision: 1925

Convert to debhelper 7 and the pydeb dh7 extension.

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

Modified: zope.copy/trunk/debian/changelog
===================================================================
--- zope.copy/trunk/debian/changelog	2009-12-30 18:16:35 UTC (rev 1924)
+++ zope.copy/trunk/debian/changelog	2009-12-30 18:45:23 UTC (rev 1925)
@@ -1,3 +1,9 @@
+zope.copy (3.5.0-4) unstable; urgency=low
+
+  * Convert to debhelper 7 and the pydeb dh7 extension.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Wed, 30 Dec 2009 19:45:58 +0100
+
 zope.copy (3.5.0-3) unstable; urgency=low
 
   * debian/control: build-depend on pyton-vab.pydeb >= 1.3.0-2.

Modified: zope.copy/trunk/debian/control
===================================================================
--- zope.copy/trunk/debian/control	2009-12-30 18:16:35 UTC (rev 1924)
+++ zope.copy/trunk/debian/control	2009-12-30 18:45:23 UTC (rev 1925)
@@ -3,17 +3,17 @@
 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.copy/trunk
 
 Package: python-zope.copy
 Architecture: all
-Depends: ${setuptools:Depends}, ${python:Depends}
-Recommends: ${setuptools:Recommends}
-Suggests: ${setuptools:Suggests}
-Provides: ${setuptools:Provides}, ${python:Provides}
+Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
+Recommends: ${pydeb:Recommends}
+Suggests: ${pydeb:Suggests}
+Provides: ${pydeb:Provides}, ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Pluggable object copying mechanism
  This package provides a pluggable way to copy persistent objects. It

Modified: zope.copy/trunk/debian/rules
===================================================================
--- zope.copy/trunk/debian/rules	2009-12-30 18:16:35 UTC (rev 1924)
+++ zope.copy/trunk/debian/rules	2009-12-30 18:45:23 UTC (rev 1925)
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
+export PYDEB_RECOMMENDS_EXTRAS=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
-	# the test extra introduces a circular dependency, to Recommends
-	(echo -n 'setuptools:Recommends=' && 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.copy/trunk/debian/tests/all
===================================================================
--- zope.copy/trunk/debian/tests/all	2009-12-30 18:16:35 UTC (rev 1924)
+++ zope.copy/trunk/debian/tests/all	2009-12-30 18:45:23 UTC (rev 1925)
@@ -1,29 +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.copy',
-                '--test-path', test_path
-                ])
-sys.exit(exitcode)
-EOF
-
-for version in ${PYVERS}; do
-    python${version} ${TMPFILE}
-done
-
-rm $TMPFILE
+. /usr/share/python-zope.testing/test_helper