r1957 - in zconfig/trunk/debian (changelog control rules tests/all)

[kobold at users.alioth.debian.org]

    Date: Tuesday, January 5, 2010 @ 20:59:46
  Author: kobold
Revision: 1957

Convert to debhelper 7 and the pydeb dh7 extension.

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

Modified: zconfig/trunk/debian/changelog
===================================================================
--- zconfig/trunk/debian/changelog	2010-01-05 20:59:42 UTC (rev 1956)
+++ zconfig/trunk/debian/changelog	2010-01-05 20:59:46 UTC (rev 1957)
@@ -1,3 +1,9 @@
+zconfig (2.7.1-4) unstable; urgency=low
+
+  * Convert to debhelper 7 and the pydeb dh7 extension.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Tue, 05 Jan 2010 21:57:47 +0100
+
 zconfig (2.7.1-3) unstable; urgency=low
 
   [ Brian Sutherland ]

Modified: zconfig/trunk/debian/control
===================================================================
--- zconfig/trunk/debian/control	2010-01-05 20:59:42 UTC (rev 1956)
+++ zconfig/trunk/debian/control	2010-01-05 20:59:46 UTC (rev 1957)
@@ -3,17 +3,17 @@
 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/zconfig/trunk
 
 Package: python-zconfig
 Architecture: all
-Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
-Provides: ${setuptools:Provides}, ${python:Provides}
-Suggests: ${setuptools:Suggests}
-Replaces: python-zodb, python2.4-zodb
+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: Structured Configuration Library

Modified: zconfig/trunk/debian/rules
===================================================================
--- zconfig/trunk/debian/rules	2010-01-05 20:59:42 UTC (rev 1956)
+++ zconfig/trunk/debian/rules	2010-01-05 20:59:46 UTC (rev 1957)
@@ -1,10 +1,15 @@
 #!/usr/bin/make -f
 
-# need to manually set this until van.pydeb 1.2.1
-py_package=ZConfig
+%:
+	dh --with pydeb --with python-central $@
 
-include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
-
-post-install-python%:
-	sed -s -i -e 's/python2.[0-9]/python/g' debian/$(package)/usr/bin/zconfig
-	sed -s -i -e 's/python2.[0-9]/python/g' debian/$(package)/usr/bin/zconfig_schema2html
+override_dh_install::
+	dh_install
+	# console scripts
+	for script in debian/$(package)/usr/bin/*; do \
+	  for py in $(shell pyversions -vr debian/control); do \
+	    cat $$script |  sed -e "s,/usr/bin/python,/usr/bin/python$$py,g" > $$script$$py; \
+	    chmod 755 $$script$$py; \
+	  done; \
+	  rm $$script; \
+	done;

Modified: zconfig/trunk/debian/tests/all
===================================================================
--- zconfig/trunk/debian/tests/all	2010-01-05 20:59:42 UTC (rev 1956)
+++ zconfig/trunk/debian/tests/all	2010-01-05 20:59:46 UTC (rev 1957)
@@ -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$',
-                '-m', 'ZConfig',
-                '--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