r2283 - in zope.testbrowser/trunk/debian (4 files)

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

    Date: Wednesday, May 25, 2011 @ 07:28:14
  Author: jinty-guest
Revision: 2283

Incorporate changes from ubuntu

Modified:
  zope.testbrowser/trunk/debian/changelog
  zope.testbrowser/trunk/debian/control
  zope.testbrowser/trunk/debian/copyright
  zope.testbrowser/trunk/debian/watch

Modified: zope.testbrowser/trunk/debian/changelog
===================================================================
--- zope.testbrowser/trunk/debian/changelog	2011-05-23 06:44:52 UTC (rev 2282)
+++ zope.testbrowser/trunk/debian/changelog	2011-05-25 07:28:14 UTC (rev 2283)
@@ -1,9 +1,17 @@
-zope.testbrowser (3.8.2-1) unstable; urgency=low
+zope.testbrowser (3.8.2-0ubuntu1) natty; urgency=low
 
-  * Update to version from ztk1.0
+  * New upstream release.
+  * src/zope/testbrowser/tests.py: Fix incorrect ZPL version, committed upstream.
 
- -- Brian Sutherland <brian at vanguardistas.net>  Wed, 03 Nov 2010 13:19:13 +0000
+ -- Gediminas Paulauskas <menesis at pov.lt>  Wed, 23 Mar 2011 20:02:33 +0200
 
+zope.testbrowser (3.8.1-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+  * LICENSE.txt: add the license.
+
+ -- Gediminas Paulauskas <menesis at pov.lt>  Fri, 27 Aug 2010 11:22:06 +0300
+
 zope.testbrowser (3.5.1-5) unstable; urgency=low
 
   * Convert to debhelper 7 and the pydeb dh7 extension.
@@ -12,7 +20,7 @@
 
 zope.testbrowser (3.5.1-4) unstable; urgency=low
 
-  * 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: #552935)
 
  -- Fabio Tranchitella <kobold at debian.org>  Sun, 08 Nov 2009 11:21:46 +0100

Modified: zope.testbrowser/trunk/debian/control
===================================================================
--- zope.testbrowser/trunk/debian/control	2011-05-23 06:44:52 UTC (rev 2282)
+++ zope.testbrowser/trunk/debian/control	2011-05-25 07:28:14 UTC (rev 2283)
@@ -3,16 +3,16 @@
 Priority: extra
 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), 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
+Build-Depends: debhelper (>= 7), python-all (>= 2.3.5-11), python-central (>= 0.6.8), python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-4)
+Standards-Version: 3.8.4
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope.testbrowser/trunk
 
 Package: python-zope.testbrowser
 Architecture: all
-Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
-Recommends: ${pydeb:Recommends}
-Provides: ${pydeb:Provides}, ${python:Provides}
+Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends},
+         python-clientform (>= 0.2.10)
+Provides: ${pydeb:Provides}
 Suggests: ${pydeb:Suggests}
 Conflicts: zope3
 XB-Python-Version: ${python:Versions}

Modified: zope.testbrowser/trunk/debian/copyright
===================================================================
--- zope.testbrowser/trunk/debian/copyright	2011-05-23 06:44:52 UTC (rev 2282)
+++ zope.testbrowser/trunk/debian/copyright	2011-05-25 07:28:14 UTC (rev 2283)
@@ -4,11 +4,11 @@
 
 Copyright:
 
-Upstream Author: Zope Corporation and Contributers <zope3-dev at zope.org>
+Upstream Author: Zope Corporation and Contributors <zope-dev at zope.org>
 
 Files contain this header:
 
-# Copyright (c) 2004 Zope Corporation and Contributors.
+# Copyright (c) 2004, 2005, 2008 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: zope.testbrowser/trunk/debian/watch
===================================================================
--- zope.testbrowser/trunk/debian/watch	2011-05-23 06:44:52 UTC (rev 2282)
+++ zope.testbrowser/trunk/debian/watch	2011-05-25 07:28:14 UTC (rev 2283)
@@ -1,3 +1,2 @@
 version=3
 http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-([0-9\.]*)\.tar\.gz
-http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-([0-9\.]*)\.zip