r2270 - in zope.contenttype/trunk/debian (4 files)

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

    Date: Wednesday, May 18, 2011 @ 20:02:29
  Author: menesis-guest
Revision: 2270

Incorporate changes from Ubuntu.

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

Modified: zope.contenttype/trunk/debian/changelog
===================================================================
--- zope.contenttype/trunk/debian/changelog	2011-05-18 19:00:56 UTC (rev 2269)
+++ zope.contenttype/trunk/debian/changelog	2011-05-18 20:02:29 UTC (rev 2270)
@@ -1,6 +1,6 @@
 zope.contenttype (3.5.1-1) unstable; urgency=low
 
-  * Update to version from ztk1.0
+  * New upstream release.
 
  -- Brian Sutherland <brian at vanguardistas.net>  Wed, 03 Nov 2010 13:01:05 +0000
 

Modified: zope.contenttype/trunk/debian/control
===================================================================
--- zope.contenttype/trunk/debian/control	2011-05-18 19:00:56 UTC (rev 2269)
+++ zope.contenttype/trunk/debian/control	2011-05-18 20:02:29 UTC (rev 2270)
@@ -3,8 +3,8 @@
 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), 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.contenttype/trunk
 

Modified: zope.contenttype/trunk/debian/copyright
===================================================================
--- zope.contenttype/trunk/debian/copyright	2011-05-18 19:00:56 UTC (rev 2269)
+++ zope.contenttype/trunk/debian/copyright	2011-05-18 20:02:29 UTC (rev 2270)
@@ -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) 2001, 2002, 2003 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: zope.contenttype/trunk/debian/watch
===================================================================
--- zope.contenttype/trunk/debian/watch	2011-05-18 19:00:56 UTC (rev 2269)
+++ zope.contenttype/trunk/debian/watch	2011-05-18 20:02:29 UTC (rev 2270)
@@ -1,3 +1,2 @@
 version=3
-http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-(.*)\.tar\.gz
-http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-(.*)\.zip
+http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-(.*)\.(?:tar\.gz|zip)