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

[arnau at users.alioth.debian.org]

    Date: Friday, October 21, 2011 @ 06:19:00
  Author: arnau
Revision: 2498

Add missing patch for tzfile.py. Thanks to Matt Giuca (Closes: #579704)

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 06:06:22 UTC (rev 2497)
+++ python-tz/trunk/debian/changelog	2011-10-21 06:19:00 UTC (rev 2498)
@@ -7,6 +7,7 @@
     - fix URL.
   * debian/patches/tzdata:
     - update following new upstream release.
+    - Add missing patch for tzfile.py. Thanks to Matt Giuca (Closes: #579704)
 
   [ Gediminas Paulauskas ]
   * Switch to dh_python2 (Closes: #617041):

Modified: python-tz/trunk/debian/patches/tzdata
===================================================================
--- python-tz/trunk/debian/patches/tzdata	2011-10-21 06:06:22 UTC (rev 2497)
+++ python-tz/trunk/debian/patches/tzdata	2011-10-21 06:19:00 UTC (rev 2498)
@@ -1,7 +1,7 @@
 Index: pytz-2011h/pytz/__init__.py
 ===================================================================
---- 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
+--- 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
@@ -34,3 +34,17 @@
      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',