r2176 - in zdaemon/trunk/debian (7 files)

[arnau at users.alioth.debian.org]

    Date: Monday, April 25, 2011 @ 07:07:52
  Author: arnau
Revision: 2176

Prepare a team upload fixing all the reported bugs

Added:
  zdaemon/trunk/debian/docs
  zdaemon/trunk/debian/examples
  zdaemon/trunk/debian/source/
  zdaemon/trunk/debian/source/format
Modified:
  zdaemon/trunk/debian/changelog
  zdaemon/trunk/debian/control
  zdaemon/trunk/debian/rules

Modified: zdaemon/trunk/debian/changelog
===================================================================
--- zdaemon/trunk/debian/changelog	2011-04-25 06:26:58 UTC (rev 2175)
+++ zdaemon/trunk/debian/changelog	2011-04-25 07:07:52 UTC (rev 2176)
@@ -1,3 +1,31 @@
+zdaemon (2.0.4-4) unstable; urgency=low
+
+  * Debian Zope packaging team upload. Closes: #623921, #623990.
+  * debian/docs:
+    + Add src/zdaemon/README.txt and CHANGES.txt.
+  * debian/examples:
+    + Add src/zdaemon/sample.conf.
+  * debian/rules:
+    + Run all the tests at build time.
+  * debian/control:
+    + Bump Standards-Version to 3.9.2. No changes needed.
+    + Add Homepage and Vcs-Browser fields.
+    + Rename XS-Vcs-Svn to Vcs-Svn (dpkg supports it now).
+    + Build-Depends on python-all rather than python-all-dev as there is no
+      extension to build.
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Switch to dh_python2 in place of deprecated python-central.
+    Closes: #617155.
+    + debian/control:
+      - Remove python-central from Build-Depends.
+      - Remove deprecated field XB-Python-Version.
+      - Rename XS-Python-Version to X-Python-Version with >= 2.4.
+      - Bump versions of python-all in Build-Depends to 2.6.6-3~.
+    + debian/rules:
+      - Use --with python2 rather than --with-python-central.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Mon, 25 Apr 2011 15:11:27 +0900
+
 zdaemon (2.0.4-3) unstable; urgency=low
 
   * Convert to debhelper 7 and the pydeb dh7 extension.

Modified: zdaemon/trunk/debian/control
===================================================================
--- zdaemon/trunk/debian/control	2011-04-25 06:26:58 UTC (rev 2175)
+++ zdaemon/trunk/debian/control	2011-04-25 07:07:52 UTC (rev 2176)
@@ -2,11 +2,19 @@
 Section: zope
 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 (>= 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/zdaemon/trunk
+Uploaders: Brian Sutherland <brian at vanguardistas.net>,
+           Fabio Tranchitella <kobold at debian.org>
+Build-Depends: debhelper (>= 7.0.50~),
+               python-all (>= 2.6.6-3~),
+               python-setuptools (>= 0.6b3),
+               python-van.pydeb (>= 1.3.0-4)
+Build-Depends-Indep: python-zconfig,
+                     python-zope.testing
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.4
+Homepage: http://pypi.python.org/pypi/zdaemon
+Vcs-Svn: svn://svn.debian.org/pkg-zope/zdaemon/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-zope/zdaemon/trunk/
 
 Package: python-zdaemon
 Architecture: all
@@ -16,7 +24,6 @@
 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
  `zdaemon` is a Python package which provides APIs for managing applications
  run as daemons. Its principal use to date has been to manage the application

Added: zdaemon/trunk/debian/docs
===================================================================
--- zdaemon/trunk/debian/docs	                        (rev 0)
+++ zdaemon/trunk/debian/docs	2011-04-25 07:07:52 UTC (rev 2176)
@@ -0,0 +1,2 @@
+src/zdaemon/README.txt
+CHANGES.txt

Added: zdaemon/trunk/debian/examples
===================================================================
--- zdaemon/trunk/debian/examples	                        (rev 0)
+++ zdaemon/trunk/debian/examples	2011-04-25 07:07:52 UTC (rev 2176)
@@ -0,0 +1 @@
+src/zdaemon/sample.conf

Modified: zdaemon/trunk/debian/rules
===================================================================
--- zdaemon/trunk/debian/rules	2011-04-25 06:26:58 UTC (rev 2175)
+++ zdaemon/trunk/debian/rules	2011-04-25 07:07:52 UTC (rev 2176)
@@ -1,13 +1,23 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with pydeb --with python-central $@
+	dh --with pydeb --with python2 $@
 
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+	for py in $(shell pyversions -vr); do \
+	  for test in tests testzdoptions testzdrun; do \
+		PYTHONPATH=debian/python-zc.buildout/usr/lib/python$$py/dist-packages \
+			python$$py setup.py test -m zdaemon.tests.$$test; \
+	  done; \
+	done;
+endif
+
 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 \
+	  for py in $(shell pyversions -vr); do \
 	    cat $$script |  sed -e "s,/usr/bin/python,/usr/bin/python$$py,g" > $$script$$py; \
 	    chmod 755 $$script$$py; \
 	  done; \

Added: zdaemon/trunk/debian/source/format
===================================================================
--- zdaemon/trunk/debian/source/format	                        (rev 0)
+++ zdaemon/trunk/debian/source/format	2011-04-25 07:07:52 UTC (rev 2176)
@@ -0,0 +1 @@
+3.0 (quilt)