r1960 - in zc.buildout/trunk/debian (5 files)

[kobold at users.alioth.debian.org]

    Date: Tuesday, January 5, 2010 @ 21:10:00
  Author: kobold
Revision: 1960

* New upstream release.
* Convert to debhelper 7 and the pydeb dh7 extension.

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

Modified: zc.buildout/trunk/debian/changelog
===================================================================
--- zc.buildout/trunk/debian/changelog	2010-01-05 21:07:31 UTC (rev 1959)
+++ zc.buildout/trunk/debian/changelog	2010-01-05 21:10:00 UTC (rev 1960)
@@ -1,3 +1,10 @@
+zc.buildout (1.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Convert to debhelper 7 and the pydeb dh7 extension.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Tue, 05 Jan 2010 22:10:02 +0100
+
 zc.buildout (1.4.1-3) unstable; urgency=low
 
   * Add myself to uploaders.

Modified: zc.buildout/trunk/debian/compat
===================================================================
--- zc.buildout/trunk/debian/compat	2010-01-05 21:07:31 UTC (rev 1959)
+++ zc.buildout/trunk/debian/compat	2010-01-05 21:10:00 UTC (rev 1960)
@@ -1 +1 @@
-4
+7

Modified: zc.buildout/trunk/debian/control
===================================================================
--- zc.buildout/trunk/debian/control	2010-01-05 21:07:31 UTC (rev 1959)
+++ zc.buildout/trunk/debian/control	2010-01-05 21:10:00 UTC (rev 1960)
@@ -3,16 +3,17 @@
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Fabio Tranchitella <kobold at debian.org>, Brian Sutherland <brian at vanguardistas.net>
-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.0.50~), 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.buildout/trunk
 
 Package: python-zc.buildout
 Architecture: all
-Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
-Recommends: ${setuptools:Recommends}
+Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
+Recommends: ${pydeb:Recommends}
+Provides: ${pydeb:Provides}, ${python:Provides}
+Suggests: ${pydeb:Suggests}
 XB-Python-Version: ${python:Versions}
 Description: system for managing development buildouts
  The Buildout project provides support for creating applications, especially

Modified: zc.buildout/trunk/debian/rules
===================================================================
--- zc.buildout/trunk/debian/rules	2010-01-05 21:07:31 UTC (rev 1959)
+++ zc.buildout/trunk/debian/rules	2010-01-05 21:10:00 UTC (rev 1960)
@@ -1,6 +1,15 @@
 #!/usr/bin/make -f
 
-include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
+%:
+	dh --with pydeb --with python-central $@
 
-post-install-python%:
-	mv debian/$(package)/usr/bin/buildout debian/$(package)/usr/bin/buildout$*
+override_dh_install::
+	dh_install
+	# console scripts
+	for script in debian/python-zdaemon/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: zc.buildout/trunk/debian/tests/all
===================================================================
--- zc.buildout/trunk/debian/tests/all	2010-01-05 21:07:31 UTC (rev 1959)
+++ zc.buildout/trunk/debian/tests/all	2010-01-05 21:10:00 UTC (rev 1960)
@@ -1,34 +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.testing',
-                '--test-path', test_path
-                ])
-sys.exit(exitcode)
-EOF
-
-for version in ${PYVERS}; do
-    stderr=$(mktemp)
-    python${version} ${TMPFILE} 2>${stderr}
-    # ignoring 'Not printing coverage data for' - spurious failure on python2.4
-    # last "cat" in pipe below because grep exits with nonzero exit status if no match.
-    cat ${stderr} | grep -v 'Not printing coverage data for' | grep -v 'A message on stderr.  Please ignore (expected in test output).' | cat >&2
-    rm ${stderr}
-done
-
-rm $TMPFILE
+. /usr/share/python-zope.testing/test_helper