r2497 - in python-tz/trunk/debian (changelog patches/tzdata)

[arnau at users.alioth.debian.org]

    Date: Friday, October 21, 2011 @ 06:06:22
  Author: arnau
Revision: 2497

Update debian/patches/tzdata following new upstream release.

Modified:
  python-tz/trunk/debian/changelog
  python-tz/trunk/debian/patches/tzdata

Modified: python-tz/trunk/debian/changelog
===================================================================
--- python-tz/trunk/debian/changelog	2011-10-21 05:56:24 UTC (rev 2496)
+++ python-tz/trunk/debian/changelog	2011-10-21 06:06:22 UTC (rev 2497)
@@ -1,11 +1,14 @@
 python-tz (2011h-1) unstable; urgency=low
 
+  * Team upload.
+
   [ Arnaud Fontaine ]
   * debian/watch:
     - fix URL.
+  * debian/patches/tzdata:
+    - update following new upstream release.
 
   [ Gediminas Paulauskas ]
-  * Team upload.
   * Switch to dh_python2 (Closes: #617041):
   * Switch to source format 3.0 (quilt)
   * debian/control:

Modified: python-tz/trunk/debian/patches/tzdata
===================================================================
--- python-tz/trunk/debian/patches/tzdata	2011-10-21 05:56:24 UTC (rev 2496)
+++ python-tz/trunk/debian/patches/tzdata	2011-10-21 06:06:22 UTC (rev 2497)
@@ -1,20 +1,20 @@
-Index: python-tz/pytz/__init__.py
+Index: pytz-2011h/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
+--- pytz-2011h.orig/pytz/__init__.py	2011-06-27 22:48:49.000000000 +0900
++++ pytz-2011h/pytz/__init__.py	2011-10-21 15:04:10.960382054 +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 tzinfo import AmbiguousTimeError, InvalidTimeError, NonExistentTimeError
- from tzinfo import unpickler
- from tzfile import build_tzinfo
-@@ -50,17 +45,12 @@ def open_resource(name):
+ 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.
      """