r1956 - in zdaemon/trunk/debian (changelog control rules tests/all)

[kobold at users.alioth.debian.org]

    Date: Tuesday, January 5, 2010 @ 20:59:42
  Author: kobold
Revision: 1956

Convert to debhelper 7 and the pydeb dh7 extension.

Modified:
  zdaemon/trunk/debian/changelog
  zdaemon/trunk/debian/control
  zdaemon/trunk/debian/rules
  zdaemon/trunk/debian/tests/all

Modified: zdaemon/trunk/debian/changelog
===================================================================
--- zdaemon/trunk/debian/changelog	2010-01-05 20:53:39 UTC (rev 1955)
+++ zdaemon/trunk/debian/changelog	2010-01-05 20:59:42 UTC (rev 1956)
@@ -1,3 +1,9 @@
+zdaemon (2.0.4-3) unstable; urgency=low
+
+  * Convert to debhelper 7 and the pydeb dh7 extension.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Tue, 05 Jan 2010 21:57:51 +0100
+
 zdaemon (2.0.4-2) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: zdaemon/trunk/debian/control
===================================================================
--- zdaemon/trunk/debian/control	2010-01-05 20:53:39 UTC (rev 1955)
+++ zdaemon/trunk/debian/control	2010-01-05 20:59:42 UTC (rev 1956)
@@ -3,16 +3,18 @@
 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 (>= 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/zdaemon/trunk
 
 Package: python-zdaemon
 Architecture: all
-Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
-Provides: ${setuptools: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
 Replaces: python-zodb, python2.4-zodb
 XB-Python-Version: ${python:Versions}
 Description: daemon process control library and tools for Unix-based systems

Modified: zdaemon/trunk/debian/rules
===================================================================
--- zdaemon/trunk/debian/rules	2010-01-05 20:53:39 UTC (rev 1955)
+++ zdaemon/trunk/debian/rules	2010-01-05 20:59:42 UTC (rev 1956)
@@ -1,3 +1,4 @@
 #!/usr/bin/make -f
 
-include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
+%:
+	dh --with pydeb --with python-central $@

Modified: zdaemon/trunk/debian/tests/all
===================================================================
--- zdaemon/trunk/debian/tests/all	2010-01-05 20:53:39 UTC (rev 1955)
+++ zdaemon/trunk/debian/tests/all	2010-01-05 20:59:42 UTC (rev 1956)
@@ -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', 'zdaemon',
-                '--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