diff -Nru python-tz-2012c/debian/changelog python-tz-2012c/debian/changelog --- python-tz-2012c/debian/changelog 2014-02-23 13:53:17.000000000 +0000 +++ python-tz-2012c/debian/changelog 2015-10-02 14:38:53.000000000 +0000 @@ -1,3 +1,11 @@ +python-tz (2012c-1ubuntu0.1) trusty; urgency=medium + + * debian/patches/use_utf8_encoding.patch: + - use utf8 encoding to be compatible with new tzdata versions + (lp: #1473533) + + -- Robert C Jennings Fri, 02 Oct 2015 09:38:53 -0500 + python-tz (2012c-1build1) trusty; urgency=medium * Rebuild to drop files installed into /usr/share/pyshared. diff -Nru python-tz-2012c/debian/control python-tz-2012c/debian/control --- python-tz-2012c/debian/control 2012-06-06 02:12:38.000000000 +0000 +++ python-tz-2012c/debian/control 2015-10-02 14:38:51.000000000 +0000 @@ -1,7 +1,8 @@ Source: python-tz Section: python Priority: optional -Maintainer: Debian/Ubuntu Zope Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian/Ubuntu Zope Team Uploaders: Brian Sutherland , Fabio Tranchitella Build-Depends: debhelper (>= 7.0.50~), diff -Nru python-tz-2012c/debian/patches/series python-tz-2012c/debian/patches/series --- python-tz-2012c/debian/patches/series 2010-01-27 17:57:30.000000000 +0000 +++ python-tz-2012c/debian/patches/series 2015-10-02 14:38:51.000000000 +0000 @@ -1 +1,2 @@ tzdata +use_utf8_encoding.patch diff -Nru python-tz-2012c/debian/patches/use_utf8_encoding.patch python-tz-2012c/debian/patches/use_utf8_encoding.patch --- python-tz-2012c/debian/patches/use_utf8_encoding.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-tz-2012c/debian/patches/use_utf8_encoding.patch 2015-10-02 14:38:51.000000000 +0000 @@ -0,0 +1,31 @@ +Description: use utf8 encoding to be compatible with new tzdata versions +Origin: upstream, http://bazaar.launchpad.net/~stub/pytz/devel/revision/367 +Bug: https://bugs.launchpad.net/pytz/+bug/1473533 + +=== modified file 'src/pytz/__init__.py' +--- + pytz/__init__.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: b/pytz/__init__.py +=================================================================== +--- a/pytz/__init__.py ++++ b/pytz/__init__.py +@@ -352,7 +352,7 @@ class _CountryTimezoneDict(_LazyDict): + zone_tab = open_resource('zone.tab') + try: + for line in zone_tab: +- line = line.decode('US-ASCII') ++ line = line.decode('UTF-8') + if line.startswith('#'): + continue + code, coordinates, zone = line.split(None, 4)[:3] +@@ -380,7 +380,7 @@ class _CountryNameDict(_LazyDict): + zone_tab = open_resource('iso3166.tab') + try: + for line in zone_tab.readlines(): +- line = line.decode('US-ASCII') ++ line = line.decode('UTF-8') + if line.startswith('#'): + continue + code, name = line.split(None, 1)