r2503 - in python-tz/tags (15 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Fri Oct 21 07:12:18 UTC 2011
Date: Friday, October 21, 2011 @ 07:12:14
Author: arnau
Revision: 2503
[svn-buildpackage] Tagging python-tz 2011h-1
Added:
python-tz/tags/2011h-1/
python-tz/tags/2011h-1/debian/changelog
(from rev 2502, python-tz/trunk/debian/changelog)
python-tz/tags/2011h-1/debian/clean
(from rev 2502, python-tz/trunk/debian/clean)
python-tz/tags/2011h-1/debian/control
(from rev 2500, python-tz/trunk/debian/control)
python-tz/tags/2011h-1/debian/patches/tzdata
(from rev 2498, python-tz/trunk/debian/patches/tzdata)
python-tz/tags/2011h-1/debian/rules
(from rev 2500, python-tz/trunk/debian/rules)
python-tz/tags/2011h-1/debian/source/
python-tz/tags/2011h-1/debian/test-pytz
(from rev 2500, python-tz/trunk/debian/test-pytz)
python-tz/tags/2011h-1/debian/watch
(from rev 2495, python-tz/trunk/debian/watch)
Deleted:
python-tz/tags/2011h-1/debian/changelog
python-tz/tags/2011h-1/debian/control
python-tz/tags/2011h-1/debian/patches/tzdata
python-tz/tags/2011h-1/debian/rules
python-tz/tags/2011h-1/debian/test-pytz
python-tz/tags/2011h-1/debian/watch
Deleted: python-tz/tags/2011h-1/debian/changelog
===================================================================
--- python-tz/trunk/debian/changelog 2011-10-19 12:49:45 UTC (rev 2493)
+++ python-tz/tags/2011h-1/debian/changelog 2011-10-21 07:12:14 UTC (rev 2503)
@@ -1,205 +0,0 @@
-python-tz (2011h-1) unstable; urgency=low
-
- * Team upload.
- * Switch to dh_python2 (Closes: #617041):
- * Switch to source format 3.0 (quilt)
- * debian/control:
- - build-depend on python-all (not -dev)
- - remove Build-Depends on python-central, python-van.pydeb and quilt
- - add Vcs-Browser
- * debian/patches/tzdata: also remove import of pkg_resources (Closes: #599047)
- * debian/copyright: rewrite in dep5 format.
-
- -- Gediminas Paulauskas <menesis at pov.lt> Wed, 19 Oct 2011 15:48:40 +0300
-
-python-tz (2011h-0.1) unstable; urgency=low
-
- * Non-maintainer upload
- * New upstream release (Closes: #616650)
-
- -- Yaroslav Halchenko <debian at onerussian.com> Tue, 13 Sep 2011 20:04:04 -0400
-
-python-tz (2010b-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Fabio Tranchitella <kobold at debian.org> Wed, 27 Jan 2010 18:33:59 +0100
-
-python-tz (2009u-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Fabio Tranchitella <kobold at debian.org> Wed, 06 Jan 2010 15:17:35 +0100
-
-python-tz (2009p-1) unstable; urgency=low
-
- [ Brian Sutherland ]
- * Apply modified patch from Kumar Appaiah to use Use
- /usr/share/python/python.mk to allow building on python2.6.
- (Closes: #547857)
-
- [ Fabio Tranchitella ]
- * New upstream release.
-
- -- Fabio Tranchitella <kobold at debian.org> Sun, 08 Nov 2009 10:00:03 +0100
-
-python-tz (2009n-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Fabio Tranchitella <kobold at debian.org> Mon, 12 Oct 2009 06:46:27 +0000
-
-python-tz (2009l-1) unstable; urgency=low
-
- * New upstream release.
- * Standards-Version: 3.8.3, no changed required.
-
- -- Fabio Tranchitella <kobold at debian.org> Fri, 28 Aug 2009 11:26:15 +0200
-
-python-tz (2009g-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: Standards-Version: 3.8.1, no changes needed.
-
- -- Fabio Tranchitella <kobold at debian.org> Thu, 04 Jun 2009 13:27:25 +0200
-
-python-tz (2009d-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Fabio Tranchitella <kobold at debian.org> Fri, 27 Mar 2009 14:24:43 +0100
-
-python-tz (2009a-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: set priority to optional. (Closes: #510028)
-
- -- Fabio Tranchitella <kobold at debian.org> Fri, 27 Feb 2009 18:49:49 +0100
-
-python-tz (2008i-1) unstable; urgency=low
-
- * New uptsream release.
-
- -- Fabio Tranchitella <kobold at debian.org> Tue, 18 Nov 2008 21:12:44 +0100
-
-python-tz (2008h-1) unstable; urgency=low
-
- * New upstream version.
- - Fixes lookup errors with unknown timezones (error setting US/Pacific-New
- timezone. LP: #244681).
- * debian/copyright: Update copyright year and download location.
- * debian/control: Update homepage.
-
- -- Matthias Klose <doko at debian.org> Mon, 27 Oct 2008 07:29:54 +0000
-
-python-tz (2008c-2) unstable; urgency=low
-
- * Do not use setuptools to build the package (the setup falls back to
- distutils).
- * Set version to 2008c. Closes: #489979.
-
- -- Matthias Klose <doko at debian.org> Wed, 09 Jul 2008 10:21:45 +0200
-
-python-tz (2008c-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Fabio Tranchitella <kobold at debian.org> Tue, 08 Jul 2008 09:12:42 +0200
-
-python-tz (2008b-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Fabio Tranchitella <kobold at debian.org> Wed, 23 Apr 2008 10:01:59 +0200
-
-python-tz (2008a-2) unstable; urgency=low
-
- * debian/control: really fix dependencies on python, thanks dato.
- (Closes: #450740)
-
- -- Fabio Tranchitella <kobold at debian.org> Tue, 15 Apr 2008 08:40:51 +0200
-
-python-tz (2008a-1) unstable; urgency=low
-
- * New upstream release.
- * debian/watch: updated. (Closes: #450014)
- * debian/control: fixed dependencies on python. (Closes: #450740)
-
- -- Fabio Tranchitella <kobold at debian.org> Wed, 19 Mar 2008 09:11:43 +0100
-
-python-tz (2007d-1) unstable; urgency=low
-
- * New upstream release (Closes: 415458)
- * Revert patch ignoring arch files, it's not necessary any and conflicted
- with upstream.
- * Patch upstream to use /usr/share/zoneinfo and remove the included version,
- also depend on tzdata package. (Closes: 416202)
- * Write and install a testrunner that can run the pytz tests in
- /usr/lib/python-tz/test-pytxX.Y which tests pythonX.Y.
- * Build depends on python-central > 0.5, debhelper > 5.0.38
- * Remove workaround for python-central/debhelper breakage.
-
- -- Brian Sutherland <jinty at web.de> Wed, 9 May 2007 12:01:36 +0200
-
-python-tz (2006p-0.2) unstable; urgency=low
-
- * Fix watch file to look at the python cheeseshop.
-
- -- Brian Sutherland <brian at vanguardistas.net> Sun, 6 May 2007 23:30:49 +0200
-
-python-tz (2006p-0.1) unstable; urgency=low
-
- * NMU.
- * New upstream version, matching the version of the tzdata package.
-
- -- Matthias Klose <doko at debian.org> Sun, 7 Jan 2007 11:42:00 +0100
-
-python-tz (2006g-1) unstable; urgency=low
-
- * New upstream version.
- * Update to new python policy using python-central (Closes: #373361)
-
- -- Brian Sutherland <jinty at web.de> Wed, 14 Jun 2006 17:54:32 +0200
-
-python-tz (2005r-1) unstable; urgency=low
-
- * New upstream version.
- * Update watchfile to use qa.debian.org's re-director.
- * Bump standards version to 3.6.2.
-
- -- Brian Sutherland <jinty at web.de> Sun, 1 Jan 2006 20:29:56 +0100
-
-python-tz (2005m-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Brian Sutherland <jinty at web.de> Thu, 15 Sep 2005 14:45:50 +0200
-
-python-tz (2005k-1) unstable; urgency=low
-
- * New upsteam version.
- * Debian specific patch removing extraneous she-bangs removed as it was
- accepted upstream.
-
- -- Brian Sutherland <jinty at web.de> Mon, 5 Sep 2005 00:34:10 +0200
-
-python-tz (2005i-2) unstable; urgency=low
-
- * Build python2.4 library so that the zope3-lib can depend on it, see
- #317742.
- * Replaces zope3-lib.
- * Patch setup.py to ignore .arch-ids directories.
-
- -- Brian Sutherland <jinty at web.de> Fri, 29 Jul 2005 00:01:54 +0200
-
-python-tz (2005i-1) unstable; urgency=low
-
- * New upstream release
-
- -- Brian Sutherland <jinty at web.de> Tue, 31 May 2005 18:02:23 +0200
-
-python-tz (2005a-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Brian Sutherland <jinty at web.de> Tue, 8 Feb 2005 02:14:33 +0100
Copied: python-tz/tags/2011h-1/debian/changelog (from rev 2502, python-tz/trunk/debian/changelog)
===================================================================
--- python-tz/tags/2011h-1/debian/changelog (rev 0)
+++ python-tz/tags/2011h-1/debian/changelog 2011-10-21 07:12:14 UTC (rev 2503)
@@ -0,0 +1,217 @@
+python-tz (2011h-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Arnaud Fontaine ]
+ * debian/watch:
+ - fix URL.
+ * debian/patches/tzdata:
+ - update following new upstream release.
+ - Add missing patch for tzfile.py. Thanks to Matt Giuca (Closes: #579704)
+ * Add Python3 support. Thanks to Stefano Rivera (Closes: #641506)
+ * Add debian/clean to get rid of egg-info/* to prevent FTBFS if
+ built twice.
+
+ [ Gediminas Paulauskas ]
+ * Switch to dh_python2 (Closes: #617041):
+ * Switch to source format 3.0 (quilt)
+ * debian/control:
+ - build-depend on python-all (not -dev)
+ - remove Build-Depends on python-central, python-van.pydeb and quilt
+ - add Vcs-Browser
+ * debian/patches/tzdata: also remove import of pkg_resources (Closes: #599047)
+ * debian/copyright: rewrite in dep5 format.
+
+ -- Arnaud Fontaine <arnau at debian.org> Fri, 21 Oct 2011 14:53:37 +0900
+
+python-tz (2011h-0.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * New upstream release (Closes: #616650)
+
+ -- Yaroslav Halchenko <debian at onerussian.com> Tue, 13 Sep 2011 20:04:04 -0400
+
+python-tz (2010b-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Wed, 27 Jan 2010 18:33:59 +0100
+
+python-tz (2009u-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Wed, 06 Jan 2010 15:17:35 +0100
+
+python-tz (2009p-1) unstable; urgency=low
+
+ [ Brian Sutherland ]
+ * Apply modified patch from Kumar Appaiah to use Use
+ /usr/share/python/python.mk to allow building on python2.6.
+ (Closes: #547857)
+
+ [ Fabio Tranchitella ]
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Sun, 08 Nov 2009 10:00:03 +0100
+
+python-tz (2009n-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Mon, 12 Oct 2009 06:46:27 +0000
+
+python-tz (2009l-1) unstable; urgency=low
+
+ * New upstream release.
+ * Standards-Version: 3.8.3, no changed required.
+
+ -- Fabio Tranchitella <kobold at debian.org> Fri, 28 Aug 2009 11:26:15 +0200
+
+python-tz (2009g-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: Standards-Version: 3.8.1, no changes needed.
+
+ -- Fabio Tranchitella <kobold at debian.org> Thu, 04 Jun 2009 13:27:25 +0200
+
+python-tz (2009d-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Fri, 27 Mar 2009 14:24:43 +0100
+
+python-tz (2009a-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: set priority to optional. (Closes: #510028)
+
+ -- Fabio Tranchitella <kobold at debian.org> Fri, 27 Feb 2009 18:49:49 +0100
+
+python-tz (2008i-1) unstable; urgency=low
+
+ * New uptsream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Tue, 18 Nov 2008 21:12:44 +0100
+
+python-tz (2008h-1) unstable; urgency=low
+
+ * New upstream version.
+ - Fixes lookup errors with unknown timezones (error setting US/Pacific-New
+ timezone. LP: #244681).
+ * debian/copyright: Update copyright year and download location.
+ * debian/control: Update homepage.
+
+ -- Matthias Klose <doko at debian.org> Mon, 27 Oct 2008 07:29:54 +0000
+
+python-tz (2008c-2) unstable; urgency=low
+
+ * Do not use setuptools to build the package (the setup falls back to
+ distutils).
+ * Set version to 2008c. Closes: #489979.
+
+ -- Matthias Klose <doko at debian.org> Wed, 09 Jul 2008 10:21:45 +0200
+
+python-tz (2008c-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Tue, 08 Jul 2008 09:12:42 +0200
+
+python-tz (2008b-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org> Wed, 23 Apr 2008 10:01:59 +0200
+
+python-tz (2008a-2) unstable; urgency=low
+
+ * debian/control: really fix dependencies on python, thanks dato.
+ (Closes: #450740)
+
+ -- Fabio Tranchitella <kobold at debian.org> Tue, 15 Apr 2008 08:40:51 +0200
+
+python-tz (2008a-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/watch: updated. (Closes: #450014)
+ * debian/control: fixed dependencies on python. (Closes: #450740)
+
+ -- Fabio Tranchitella <kobold at debian.org> Wed, 19 Mar 2008 09:11:43 +0100
+
+python-tz (2007d-1) unstable; urgency=low
+
+ * New upstream release (Closes: 415458)
+ * Revert patch ignoring arch files, it's not necessary any and conflicted
+ with upstream.
+ * Patch upstream to use /usr/share/zoneinfo and remove the included version,
+ also depend on tzdata package. (Closes: 416202)
+ * Write and install a testrunner that can run the pytz tests in
+ /usr/lib/python-tz/test-pytxX.Y which tests pythonX.Y.
+ * Build depends on python-central > 0.5, debhelper > 5.0.38
+ * Remove workaround for python-central/debhelper breakage.
+
+ -- Brian Sutherland <jinty at web.de> Wed, 9 May 2007 12:01:36 +0200
+
+python-tz (2006p-0.2) unstable; urgency=low
+
+ * Fix watch file to look at the python cheeseshop.
+
+ -- Brian Sutherland <brian at vanguardistas.net> Sun, 6 May 2007 23:30:49 +0200
+
+python-tz (2006p-0.1) unstable; urgency=low
+
+ * NMU.
+ * New upstream version, matching the version of the tzdata package.
+
+ -- Matthias Klose <doko at debian.org> Sun, 7 Jan 2007 11:42:00 +0100
+
+python-tz (2006g-1) unstable; urgency=low
+
+ * New upstream version.
+ * Update to new python policy using python-central (Closes: #373361)
+
+ -- Brian Sutherland <jinty at web.de> Wed, 14 Jun 2006 17:54:32 +0200
+
+python-tz (2005r-1) unstable; urgency=low
+
+ * New upstream version.
+ * Update watchfile to use qa.debian.org's re-director.
+ * Bump standards version to 3.6.2.
+
+ -- Brian Sutherland <jinty at web.de> Sun, 1 Jan 2006 20:29:56 +0100
+
+python-tz (2005m-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Brian Sutherland <jinty at web.de> Thu, 15 Sep 2005 14:45:50 +0200
+
+python-tz (2005k-1) unstable; urgency=low
+
+ * New upsteam version.
+ * Debian specific patch removing extraneous she-bangs removed as it was
+ accepted upstream.
+
+ -- Brian Sutherland <jinty at web.de> Mon, 5 Sep 2005 00:34:10 +0200
+
+python-tz (2005i-2) unstable; urgency=low
+
+ * Build python2.4 library so that the zope3-lib can depend on it, see
+ #317742.
+ * Replaces zope3-lib.
+ * Patch setup.py to ignore .arch-ids directories.
+
+ -- Brian Sutherland <jinty at web.de> Fri, 29 Jul 2005 00:01:54 +0200
+
+python-tz (2005i-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Brian Sutherland <jinty at web.de> Tue, 31 May 2005 18:02:23 +0200
+
+python-tz (2005a-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Brian Sutherland <jinty at web.de> Tue, 8 Feb 2005 02:14:33 +0100
Copied: python-tz/tags/2011h-1/debian/clean (from rev 2502, python-tz/trunk/debian/clean)
===================================================================
--- python-tz/tags/2011h-1/debian/clean (rev 0)
+++ python-tz/tags/2011h-1/debian/clean 2011-10-21 07:12:14 UTC (rev 2503)
@@ -0,0 +1 @@
+pytz.egg-info/*
Deleted: python-tz/tags/2011h-1/debian/control
===================================================================
--- python-tz/trunk/debian/control 2011-10-19 12:49:45 UTC (rev 2493)
+++ python-tz/tags/2011h-1/debian/control 2011-10-21 07:12:14 UTC (rev 2503)
@@ -1,21 +0,0 @@
-Source: python-tz
-Section: python
-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 (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
-Homepage: http://pypi.python.org/pypi/pytz/
-X-Python-Version: >= 2.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-zope/python-tz/trunk
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-zope/python-tz/trunk
-
-Package: python-tz
-Architecture: all
-Depends: tzdata, ${python:Depends}, ${misc:Depends}
-Description: Python version of the Olson timezone database
- python-tz brings the Olson tz database into Python. This library allows
- accurate and cross platform timezone calculations using Python 2.3 or higher.
- It also solves the issue of ambiguous times at the end of daylight savings,
- which you can read more about in the Python Library Reference
- (datetime.tzinfo).
Copied: python-tz/tags/2011h-1/debian/control (from rev 2500, python-tz/trunk/debian/control)
===================================================================
--- python-tz/tags/2011h-1/debian/control (rev 0)
+++ python-tz/tags/2011h-1/debian/control 2011-10-21 07:12:14 UTC (rev 2503)
@@ -0,0 +1,39 @@
+Source: python-tz
+Section: python
+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 (>= 2.6.6-3~),
+ python3-all,
+ python-setuptools,
+ python3-setuptools
+Standards-Version: 3.9.2
+Homepage: http://pypi.python.org/pypi/pytz/
+X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-zope/python-tz/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-zope/python-tz/trunk
+
+Package: python-tz
+Architecture: all
+Depends: tzdata, ${python:Depends}, ${misc:Depends}
+Description: Python version of the Olson timezone database
+ python-tz brings the Olson tz database into Python. This library allows
+ accurate and cross platform timezone calculations using Python 2.3 or higher.
+ It also solves the issue of ambiguous times at the end of daylight savings,
+ which you can read more about in the Python Library Reference
+ (datetime.tzinfo).
+
+Package: python3-tz
+Architecture: all
+Depends: tzdata, ${python3:Depends}, ${misc:Depends}
+Description: Python3 version of the Olson timezone database
+ python-tz brings the Olson tz database into Python. This library allows
+ accurate and cross platform timezone calculations using Python 2.3 or higher.
+ It also solves the issue of ambiguous times at the end of daylight savings,
+ which you can read more about in the Python Library Reference
+ (datetime.tzinfo).
+ .
+ This package contains the Python 3 version of the library.
Deleted: python-tz/tags/2011h-1/debian/patches/tzdata
===================================================================
--- python-tz/trunk/debian/patches/tzdata 2011-10-19 12:49:45 UTC (rev 2493)
+++ python-tz/tags/2011h-1/debian/patches/tzdata 2011-10-21 07:12:14 UTC (rev 2503)
@@ -1,36 +0,0 @@
-Index: python-tz/pytz/__init__.py
-===================================================================
---- python-tz.orig/pytz/__init__.py
-+++ python-tz/pytz/__init__.py
-@@ -28,11 +28,6 @@ __all__ = [
- import sys, datetime, os.path, gettext
- from UserDict import DictMixin
-
--try:
-- from pkg_resources import resource_stream
--except ImportError:
-- resource_stream = None
--
- from tzinfo import AmbiguousTimeError, InvalidTimeError, NonExistentTimeError
- from tzinfo import unpickler
- from tzfile import build_tzinfo
-@@ -50,17 +45,12 @@ def open_resource(name):
- Uses the pkg_resources module if available and no standard file
- found at the calculated location.
- """
-+ # Patched in Debian, use the system zoneinfo from the tzdata package
- name_parts = name.lstrip('/').split('/')
- for part in name_parts:
- if part == os.path.pardir or os.path.sep in part:
- raise ValueError('Bad path segment: %r' % part)
-- filename = os.path.join(os.path.dirname(__file__),
-- 'zoneinfo', *name_parts)
-- if not os.path.exists(filename) and resource_stream is not None:
-- # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-- # unless absolutely necessary to help when a broken version of
-- # pkg_resources is installed.
-- return resource_stream(__name__, 'zoneinfo/' + name)
-+ filename = os.path.join('/usr/share/zoneinfo', *name_parts)
- return open(filename, 'rb')
-
-
Copied: python-tz/tags/2011h-1/debian/patches/tzdata (from rev 2498, python-tz/trunk/debian/patches/tzdata)
===================================================================
--- python-tz/tags/2011h-1/debian/patches/tzdata (rev 0)
+++ python-tz/tags/2011h-1/debian/patches/tzdata 2011-10-21 07:12:14 UTC (rev 2503)
@@ -0,0 +1,50 @@
+Index: pytz-2011h/pytz/__init__.py
+===================================================================
+--- pytz-2011h.orig/pytz/__init__.py 2011-10-21 15:14:54.048406509 +0900
++++ pytz-2011h/pytz/__init__.py 2011-10-21 15:14:57.232406629 +0900
+@@ -31,11 +31,6 @@
+ except ImportError:
+ from collections import Mapping as DictMixin
+
+-try:
+- from pkg_resources import resource_stream
+-except ImportError:
+- resource_stream = None
+-
+ from pytz.exceptions import AmbiguousTimeError
+ from pytz.exceptions import InvalidTimeError
+ from pytz.exceptions import NonExistentTimeError
+@@ -87,17 +82,12 @@
+ Uses the pkg_resources module if available and no standard file
+ found at the calculated location.
+ """
++ # Patched in Debian, use the system zoneinfo from the tzdata package
+ name_parts = name.lstrip('/').split('/')
+ for part in name_parts:
+ if part == os.path.pardir or os.path.sep in part:
+ raise ValueError('Bad path segment: %r' % part)
+- filename = os.path.join(os.path.dirname(__file__),
+- 'zoneinfo', *name_parts)
+- if not os.path.exists(filename) and resource_stream is not None:
+- # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+- # unless absolutely necessary to help when a broken version of
+- # pkg_resources is installed.
+- return resource_stream(__name__, 'zoneinfo/' + name)
++ filename = os.path.join('/usr/share/zoneinfo', *name_parts)
+ return open(filename, 'rb')
+
+
+Index: pytz-2011h/pytz/tzfile.py
+===================================================================
+--- pytz-2011h.orig/pytz/tzfile.py 2011-06-27 22:48:49.000000000 +0900
++++ pytz-2011h/pytz/tzfile.py 2011-10-21 15:16:11.116409439 +0900
+@@ -125,7 +125,8 @@
+ if __name__ == '__main__':
+ import os.path
+ from pprint import pprint
+- base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
++ # Patched in Debian, use the system zoninfo from the tzdata package
++ base = '/usr/share/zoneinfo'
+ tz = build_tzinfo('Australia/Melbourne',
+ open(os.path.join(base,'Australia','Melbourne'), 'rb'))
+ tz = build_tzinfo('US/Eastern',
Deleted: python-tz/tags/2011h-1/debian/rules
===================================================================
--- python-tz/trunk/debian/rules 2011-10-19 12:49:45 UTC (rev 2493)
+++ python-tz/tags/2011h-1/debian/rules 2011-10-21 07:12:14 UTC (rev 2503)
@@ -1,11 +0,0 @@
-#!/usr/bin/make -f
-
-%:
- dh --with python2 $@
-
-override_dh_install:
- dh_install
- # install our testing package
- install -D debian/test-pytz debian/python-tz/usr/lib/python-tz/test-pytz.py
- # remove zoneinfo, our patch to pytz makes it use the one from tzdata
- rm -rf debian/python-tz/usr/lib/python*/*-packages/pytz/zoneinfo
Copied: python-tz/tags/2011h-1/debian/rules (from rev 2500, python-tz/trunk/debian/rules)
===================================================================
--- python-tz/tags/2011h-1/debian/rules (rev 0)
+++ python-tz/tags/2011h-1/debian/rules 2011-10-21 07:12:14 UTC (rev 2503)
@@ -0,0 +1,40 @@
+#!/usr/bin/make -f
+
+PACKAGE=python-tz
+PACKAGE_PYTHON3=python3-tz
+
+PYVERS:=$(shell pyversions -r)
+PY3VERS:=$(shell py3versions -r)
+
+%:
+ dh --with python2 --with python3 $@
+
+override_dh_auto_build:
+ dh_auto_build -p$(PACKAGE)
+
+ set -e; \
+ for python in $(PY3VERS); do \
+ $$python setup.py build; \
+ done
+
+override_dh_auto_install:
+ dh_auto_install -p$(PACKAGE) --destdir=$(CURDIR)/debian/$(PACKAGE)
+
+ set -ex; \
+ for python in $(PY3VERS); do \
+ $$python setup.py install --install-layout=deb \
+ --root=$(CURDIR)/debian/$(PACKAGE_PYTHON3); \
+ done
+
+override_dh_clean:
+ dh_clean
+ rm -rf build
+
+override_dh_install:
+ dh_install
+
+ # install our testing package
+ install -D debian/test-pytz debian/python-tz/usr/lib/python-tz/test-pytz.py
+
+ # remove zoneinfo, our patch to pytz makes it use the one from tzdata
+ rm -rf debian/python*-tz/usr/lib/python*/*-packages/pytz/zoneinfo
Deleted: python-tz/tags/2011h-1/debian/test-pytz
===================================================================
--- python-tz/trunk/debian/test-pytz 2011-10-19 12:49:45 UTC (rev 2493)
+++ python-tz/tags/2011h-1/debian/test-pytz 2011-10-21 07:12:14 UTC (rev 2503)
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-"""Run to test the system python"""
-import doctest
-import pytz
-import pytz.tzinfo
-import sys
-
-errors = 0
-tests = 0
-for mod in [pytz, pytz.tzinfo]:
- mod_errors, mod_tests = doctest.testmod(mod)
- errors += mod_errors
- tests += mod_tests
-
-if not errors:
- print "Ran %s tests successfully." % tests
-sys.exit(errors)
Copied: python-tz/tags/2011h-1/debian/test-pytz (from rev 2500, python-tz/trunk/debian/test-pytz)
===================================================================
--- python-tz/tags/2011h-1/debian/test-pytz (rev 0)
+++ python-tz/tags/2011h-1/debian/test-pytz 2011-10-21 07:12:14 UTC (rev 2503)
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+"""Run to test the system python"""
+import doctest
+import pytz
+import pytz.tzinfo
+import sys
+
+errors = 0
+tests = 0
+for mod in [pytz, pytz.tzinfo]:
+ mod_errors, mod_tests = doctest.testmod(mod)
+ errors += mod_errors
+ tests += mod_tests
+
+if not errors:
+ print("Ran %s tests successfully." % tests)
+sys.exit(errors)
Deleted: python-tz/tags/2011h-1/debian/watch
===================================================================
--- python-tz/trunk/debian/watch 2011-10-19 12:49:45 UTC (rev 2493)
+++ python-tz/tags/2011h-1/debian/watch 2011-10-21 07:12:14 UTC (rev 2503)
@@ -1,2 +0,0 @@
-version=3
-http://pypi.python.org/pypi/pytz http://pypi.python.org/packages/source/p/pytz/pytz-(.*).tar.gz#md5=.*
Copied: python-tz/tags/2011h-1/debian/watch (from rev 2495, python-tz/trunk/debian/watch)
===================================================================
--- python-tz/tags/2011h-1/debian/watch (rev 0)
+++ python-tz/tags/2011h-1/debian/watch 2011-10-21 07:12:14 UTC (rev 2503)
@@ -0,0 +1,2 @@
+version=3
+http://pypi.python.org/packages/source/p/pytz/pytz-(.*).tar.gz
More information about the pkg-zope-developers
mailing list