r1954 - in zc.lockfile/trunk/debian (changelog control rules tests/all)

[kobold at users.alioth.debian.org]

    Date: Tuesday, January 5, 2010 @ 20:52:23
  Author: kobold
Revision: 1954

Convert to debhelper 7 and the pydeb dh7 extension.

Modified:
  zc.lockfile/trunk/debian/changelog
  zc.lockfile/trunk/debian/control
  zc.lockfile/trunk/debian/rules
  zc.lockfile/trunk/debian/tests/all

Modified: zc.lockfile/trunk/debian/changelog
===================================================================
--- zc.lockfile/trunk/debian/changelog	2010-01-05 20:46:55 UTC (rev 1953)
+++ zc.lockfile/trunk/debian/changelog	2010-01-05 20:52:23 UTC (rev 1954)
@@ -1,3 +1,9 @@
+zc.lockfile (1.0.0-4) unstable; urgency=low
+
+  * Convert to debhelper 7 and the pydeb dh7 extension.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Tue, 05 Jan 2010 21:51:04 +0100
+
 zc.lockfile (1.0.0-3) unstable; urgency=low
 
   [ Brian Sutherland ]

Modified: zc.lockfile/trunk/debian/control
===================================================================
--- zc.lockfile/trunk/debian/control	2010-01-05 20:46:55 UTC (rev 1953)
+++ zc.lockfile/trunk/debian/control	2010-01-05 20:52:23 UTC (rev 1954)
@@ -3,20 +3,20 @@
 Priority: optional
 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, python-all-dev, python-central, python-setuptools, 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/zc.lockfile/trunk
 
 Package: python-zc.lockfile
 Architecture: all
-Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
-Provides: python-zc, ${setuptools:Provides}, ${python:Provides}
-Conflicts: python-zc
+Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
+Recommends: ${pydeb:Recommends}
+Provides: ${pydeb:Provides}, ${python:Provides}, python-zc
+Suggests: ${pydeb:Suggests}
 Replaces: python-zc
-Suggests: ${setuptools:Suggests}
 XB-Python-Version: ${python:Versions}
-Description: basic inter-process locks
+Description: Basic inter-process locks
  The zc.lockfile package provides a basic portable implementation of
  interprocess locks using lock files. The purpose if not specifically to lock
  files, but to simply provide locks with an implementation based on

Modified: zc.lockfile/trunk/debian/rules
===================================================================
--- zc.lockfile/trunk/debian/rules	2010-01-05 20:46:55 UTC (rev 1953)
+++ zc.lockfile/trunk/debian/rules	2010-01-05 20:52:23 UTC (rev 1954)
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
+%:
+	dh --with pydeb --with python-central $@
 
-post-install-python%:
-	install -D -m 644 src/zc/__init__.py \
-	    debian/$(package)$(call py_libdir,$*)/zc/__init__.py
+overRIde_dh_install:
+	# zc.lockfile provides the zc namespace __init__.py
+	for py in $(shell pyversions -vr debian/control); do \
+	    cp src/zope/__init__.py debian/python-zc.lockfile/usr/lib/python$$py/*-packages/zc/; \
+	done

Modified: zc.lockfile/trunk/debian/tests/all
===================================================================
--- zc.lockfile/trunk/debian/tests/all	2010-01-05 20:46:55 UTC (rev 1953)
+++ zc.lockfile/trunk/debian/tests/all	2010-01-05 20:52:23 UTC (rev 1954)
@@ -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', 'zc.lockfile',
-                '--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