r2295 - in zdaemon/trunk/debian (changelog control rules watch)

[menesis-guest at users.alioth.debian.org]

    Date: Thursday, June 9, 2011 @ 12:00:20
  Author: menesis-guest
Revision: 2295

Take all changes from Ubuntu:
* debian/rules:
  - Fix typo in test search path.
  - Remove --with pydeb.
* debian/control:
  - Remove Replaces: python-zodb, looks like a copy-paste mistake.
  - Remove python-van.pydeb from Build-Depends.

Modified:
  zdaemon/trunk/debian/changelog
  zdaemon/trunk/debian/control
  zdaemon/trunk/debian/rules
  zdaemon/trunk/debian/watch

Modified: zdaemon/trunk/debian/changelog
===================================================================
--- zdaemon/trunk/debian/changelog	2011-06-07 12:38:05 UTC (rev 2294)
+++ zdaemon/trunk/debian/changelog	2011-06-09 12:00:20 UTC (rev 2295)
@@ -1,3 +1,14 @@
+zdaemon (2.0.4-6) unstable; urgency=low
+
+  * debian/rules:
+    - Fix typo in test search path.
+    - Remove --with pydeb.
+  * debian/control:
+    - Remove Replaces: python-zodb, looks like a copy-paste mistake.
+    - Remove python-van.pydeb from Build-Depends.
+
+ -- Gediminas Paulauskas <menesis at pov.lt>  Thu, 09 Jun 2011 14:55:24 +0300
+
 zdaemon (2.0.4-5) unstable; urgency=low
 
   * Team upload.
@@ -52,7 +63,7 @@
     priority optional.
 
   [ Fabio Tranchitella ]
-  * debian/control: build-depend on pyton-vab.pydeb >= 1.3.0-2.
+  * debian/control: build-depend on python-van.pydeb >= 1.3.0-2.
     (Closes: #552684)
 
  -- Fabio Tranchitella <kobold at debian.org>  Sun, 08 Nov 2009 11:19:41 +0100

Modified: zdaemon/trunk/debian/control
===================================================================
--- zdaemon/trunk/debian/control	2011-06-07 12:38:05 UTC (rev 2294)
+++ zdaemon/trunk/debian/control	2011-06-09 12:00:20 UTC (rev 2295)
@@ -6,8 +6,7 @@
            Fabio Tranchitella <kobold at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
                python-all (>= 2.6.6-3~),
-               python-setuptools,
-               python-van.pydeb (>= 1.3.0-4)
+               python-setuptools
 Build-Depends-Indep: python-zconfig,
                      python-zope.testing
 Standards-Version: 3.9.2
@@ -18,12 +17,9 @@
 
 Package: python-zdaemon
 Architecture: all
-Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
-Recommends: ${pydeb:Recommends}
-Provides: ${pydeb:Provides}, ${python:Provides}
-Suggests: ${pydeb:Suggests}
+Depends: ${python:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
 Conflicts: zope3
-Replaces: python-zodb, python2.4-zodb
 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

Modified: zdaemon/trunk/debian/rules
===================================================================
--- zdaemon/trunk/debian/rules	2011-06-07 12:38:05 UTC (rev 2294)
+++ zdaemon/trunk/debian/rules	2011-06-09 12:00:20 UTC (rev 2295)
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with pydeb --with python2 $@
+	dh --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 \
+		PYTHONPATH=debian/python-zdaemon/usr/lib/python$$py/dist-packages \
 			python$$py setup.py test -m zdaemon.tests.$$test; \
 	  done; \
 	done;

Modified: zdaemon/trunk/debian/watch
===================================================================
--- zdaemon/trunk/debian/watch	2011-06-07 12:38:05 UTC (rev 2294)
+++ zdaemon/trunk/debian/watch	2011-06-09 12:00:20 UTC (rev 2295)
@@ -1,3 +1,2 @@
 version=3
-http://pypi.python.org/packages/source/z/zdaemon/zdaemon-(.*)\.tar\.gz
-http://pypi.python.org/packages/source/z/zdaemon/zdaemon-(.*)\.zip
+http://pypi.python.org/packages/source/z/zdaemon/zdaemon-(.*)\.(?:tar\.gz|zip)