diff -Nru python-tz-2011k/.bzr/branch/branch.conf python-tz-2011h/.bzr/branch/branch.conf --- python-tz-2011k/.bzr/branch/branch.conf 2011-10-21 18:38:24.000000000 +0000 +++ python-tz-2011h/.bzr/branch/branch.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -parent_location = bzr+ssh://bazaar.launchpad.net/%2Bbranch/ubuntu/python-tz/ -submit_branch = file:///home/barry/projects/ubuntu/pytz/merge/ diff -Nru python-tz-2011k/.bzr/branch/format python-tz-2011h/.bzr/branch/format --- python-tz-2011k/.bzr/branch/format 2011-10-20 19:15:57.000000000 +0000 +++ python-tz-2011h/.bzr/branch/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Bazaar Branch Format 7 (needs bzr 1.6) diff -Nru python-tz-2011k/.bzr/branch/last-revision python-tz-2011h/.bzr/branch/last-revision --- python-tz-2011k/.bzr/branch/last-revision 2011-10-21 18:39:17.000000000 +0000 +++ python-tz-2011h/.bzr/branch/last-revision 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -23 barry@python.org-20111021183916-648g8gmlv2z08vbn diff -Nru python-tz-2011k/.bzr/branch/tags python-tz-2011h/.bzr/branch/tags --- python-tz-2011k/.bzr/branch/tags 2011-10-21 18:38:24.000000000 +0000 +++ python-tz-2011h/.bzr/branch/tags 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -d7:2005a-155:james.westby@ubuntu.com-20050208021433-zxsohvjidw94009q7:2005m-155:james.westby@ubuntu.com-20050915144550-sl8c9l8604ywl8qd14:2005r-1ubuntu155:james.westby@ubuntu.com-20060214142904-36lky2owqswc1g5q7:2006g-155:james.westby@ubuntu.com-20060614175432-l3my3m10k1mwjwwf9:2006p-0.155:james.westby@ubuntu.com-20070107114200-1eqnc9xpeawrhzxv14:2007c-0ubuntu155:james.westby@ubuntu.com-20070305023534-z5ms36hfatosmh2k7:2007d-155:james.westby@ubuntu.com-20070509120136-oi18syaota63tyzy14:2007d-1ubuntu155:james.westby@ubuntu.com-20080227081949-s92t0h3m357m5gds14:2007k-0ubuntu155:james.westby@ubuntu.com-20080227084404-1wrhvjplt41csgot14:2007k-0ubuntu255:james.westby@ubuntu.com-20080310124731-nlcbzsu1x9mpqnvc14:2008b-3ubuntu155:james.westby@ubuntu.com-20080623144623-kxu9e1k11h1tltr27:2008c-255:james.westby@ubuntu.com-20080709102145-tx62a4n7ztel3lz07:2008h-155:james.westby@ubuntu.com-20081027072954-y0tje6borovf4eva7:2008i-155:james.westby@ubuntu.com-20081118211244-lp42kgd1msmo8yco7:2009a-155:james.westby@ubuntu.com-20090227184949-cyhm2jgcdc6448ov7:2009d-155:james.westby@ubuntu.com-20090327142443-6ifqr9hczucsgf2g7:2009g-155:james.westby@ubuntu.com-20090604132725-ixcr23kz4q7u5xmw7:2009l-155:james.westby@ubuntu.com-20090828112615-222uxmuecho70cwt7:2009n-155:james.westby@ubuntu.com-20091012064627-uuspiirvpjki9aii7:2009p-155:james.westby@ubuntu.com-20091108100003-lh6jg6o2je0q9ult7:2009u-155:james.westby@ubuntu.com-20100106151735-ncucmsnx9mklrt3k7:2010b-155:james.westby@ubuntu.com-20100127183359-7vxnxgzl5ysokzue14:2010b-1ubuntu157:package-import@ubuntu.com-20110823181425-af676e7psc5lw8m314:2010b-1ubuntu246:menesis@pov.lt-20110824133227-1odvp74nclydhe2s9:2011h-0.157:package-import@ubuntu.com-20110913200404-wj7yznmvhix913b416:2011h-0.1ubuntu148:barry@python.org-20111021180156-duzsghk4gtxjcbon14:2011k-0ubuntu148:barry@python.org-20111021183812-1qzwnsx9cge91oh914:upstream-2005a55:james.westby@ubuntu.com-20050208021433-t6c9teignwsm2ywo14:upstream-2005m55:james.westby@ubuntu.com-20050915144550-2ywencgsur1mzml014:upstream-2005r55:james.westby@ubuntu.com-20060214142904-yr03o8hhi1ha80tn14:upstream-2006g55:james.westby@ubuntu.com-20060614175432-0njifztz1bv7kfo014:upstream-2006p55:james.westby@ubuntu.com-20070107114200-0a1q81dccifsnuj414:upstream-2007c55:james.westby@ubuntu.com-20070305023534-pzkbnpem0p5s27pj14:upstream-2007d55:james.westby@ubuntu.com-20070509120136-ek3grqr14mqns58s14:upstream-2007k55:james.westby@ubuntu.com-20080227084404-ttdtt5amjgi6ewtj14:upstream-2008b55:james.westby@ubuntu.com-20080623144623-248w8wh63bip8zfx14:upstream-2008c55:james.westby@ubuntu.com-20080709102145-271mp7hbxi0jbb0o14:upstream-2008h55:james.westby@ubuntu.com-20081027072954-dwobeldazeq5twl514:upstream-2008i55:james.westby@ubuntu.com-20081118211244-qm6tyh4efthkqg2d14:upstream-2009a55:james.westby@ubuntu.com-20090227184949-sn9yx5dbh4vgtmpt14:upstream-2009d55:james.westby@ubuntu.com-20090327142443-khdw2j6gwf2wvi0314:upstream-2009g55:james.westby@ubuntu.com-20090604132725-lu0q5ftwsu30y9ws14:upstream-2009l55:james.westby@ubuntu.com-20090828112615-v4n3ie7cc223rtz814:upstream-2009n55:james.westby@ubuntu.com-20091012064627-654xf157s1ubu4fu14:upstream-2009p55:james.westby@ubuntu.com-20091108100003-g0x9hw5nuu1jx6xz14:upstream-2009u55:james.westby@ubuntu.com-20100106151735-hbkiulyrougbcrnr14:upstream-2010b55:james.westby@ubuntu.com-20100127183359-1jzrixt9i0x4yu2i14:upstream-2011h57:package-import@ubuntu.com-20110913200404-7sbq72h0sfsnsjsee \ No newline at end of file diff -Nru python-tz-2011k/.bzr/branch-format python-tz-2011h/.bzr/branch-format --- python-tz-2011k/.bzr/branch-format 2011-10-20 19:15:57.000000000 +0000 +++ python-tz-2011h/.bzr/branch-format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Bazaar-NG meta directory, format 1 diff -Nru python-tz-2011k/.bzr/checkout/conflicts python-tz-2011h/.bzr/checkout/conflicts --- python-tz-2011k/.bzr/checkout/conflicts 2011-10-21 18:38:24.000000000 +0000 +++ python-tz-2011h/.bzr/checkout/conflicts 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -BZR conflict list format 1 Binary files /tmp/kVyb7n5R9b/python-tz-2011k/.bzr/checkout/dirstate and /tmp/fgu6EvR3mv/python-tz-2011h/.bzr/checkout/dirstate differ diff -Nru python-tz-2011k/.bzr/checkout/format python-tz-2011h/.bzr/checkout/format --- python-tz-2011k/.bzr/checkout/format 2011-10-20 19:15:58.000000000 +0000 +++ python-tz-2011h/.bzr/checkout/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Bazaar Working Tree Format 6 (bzr 1.14) diff -Nru python-tz-2011k/.bzr/checkout/merge-hashes python-tz-2011h/.bzr/checkout/merge-hashes --- python-tz-2011k/.bzr/checkout/merge-hashes 2011-10-21 18:38:24.000000000 +0000 +++ python-tz-2011h/.bzr/checkout/merge-hashes 1970-01-01 00:00:00.000000000 +0000 @@ -1,465 +0,0 @@ -BZR merge-modified list format 1 -file_id: damascus-20091205050816-atehe9u3hbg3yr96-890 -hash: 082eac5ff10c42b2542958fd242a3d8499fcd543 - -file_id: dhaka-20091205050816-atehe9u3hbg3yr96-891 -hash: 09389a490dce3881670cf914895905a2bca220d4 - -file_id: menominee-20091205050816-atehe9u3hbg3yr96-806 -hash: 7e9e3de3f6341fd32673b90bb788df51c81fc5c1 - -file_id: turkey-20091205050816-atehe9u3hbg3yr96-1208 -hash: 83f0a6c1dfcf31a637dac5cca7d214da6b98bf35 - -file_id: tucuman-20091205050816-atehe9u3hbg3yr96-720 -hash: 13a16bce8aa4f5f157df90aef151356b4c1544a5 - -file_id: vladivostok-20091205050816-atehe9u3hbg3yr96-952 -hash: 43841b42df75d3f82ef37880022515bdd6825107 - -file_id: colombo-20091205050816-atehe9u3hbg3yr96-888 -hash: 60eea71d15a08fb1b23f0c1dfc5cd61670623216 - -file_id: managua-20091205050816-atehe9u3hbg3yr96-801 -hash: 42518c60cd1d062adb0d04c594850edc6466d149 - -file_id: asuncion-20091205050816-atehe9u3hbg3yr96-739 -hash: 845dd6b9289584ff837f944b77b1bcbf69a26660 - -file_id: catamarca-20091205050816-atehe9u3hbg3yr96-712 -hash: 3d3fccb1381201775cd06b9b038ec0af0b4f7051 - -file_id: hawaii-20091205050816-atehe9u3hbg3yr96-1163 -hash: d55844608a7ab459124b8ce4b1b970896b7aa5d5 - -file_id: aqtau-20091205050816-atehe9u3hbg3yr96-873 -hash: cf23ee4286a7f8f92e462883f18043d3c4609611 - -file_id: beulah-20110926143221-du1vqyr0x805hhch-3 -hash: 41daa3def30597130fc2426a668e4cc504576b4f - -file_id: roc-20091205050816-atehe9u3hbg3yr96-1205 -hash: 8ffa18d861f043aa3b90bb724b80e57f2215db44 - -file_id: havana-20091205050816-atehe9u3hbg3yr96-787 -hash: f74e1f407096c86c864018ee766d9b8be54ebef5 - -file_id: test_tzinfo.py-20091205050816-atehe9u3hbg3yr96-629 -hash: 74a6bedbb6578cf8f91f2990e2a0ea284e601915 - -file_id: phnom_penh-20091205050816-atehe9u3hbg3yr96-923 -hash: bb9808a3054f740cff404eca6d5d5c490e33f1f7 - -file_id: pkginfo-20091205050816-atehe9u3hbg3yr96-642 -hash: c8725ed85f1a67ed80a5cf93b46da22e20971406 - -file_id: hermosillo-20091205050816-atehe9u3hbg3yr96-788 -hash: f30b6d0c53044589bfc2c77afe7d377e2cbe1631 - -file_id: istanbul-20091205050816-atehe9u3hbg3yr96-900 -hash: 83f0a6c1dfcf31a637dac5cca7d214da6b98bf35 - -file_id: knox-20091205050816-atehe9u3hbg3yr96-723 -hash: a865f3d7347a2723c1f776b0e5bfd2d8985eff06 - -file_id: ho_chi_minh-20091205050816-atehe9u3hbg3yr96-1230 -hash: 71f384fa4a6b0991a232da936c44e5e6dd5a286e - -file_id: cairo-20091205050816-atehe9u3hbg3yr96-671 -hash: 2c76400541f0098a1022db11790e890fa53a18d6 - -file_id: volgograd-20091205050816-atehe9u3hbg3yr96-1094 -hash: 751c04c05375c709f3d3fba494c9fe941cffd97e - -file_id: samara-20091205050816-atehe9u3hbg3yr96-1079 -hash: ee9b3de05fe46d5d42e1d8899b3818379ec116c7 - -file_id: casablanca-20091205050816-atehe9u3hbg3yr96-672 -hash: e74e75112d0e82e02ccd1c54d707d726f833a5f2 - -file_id: cuba-20091205050816-atehe9u3hbg3yr96-1172 -hash: f74e1f407096c86c864018ee766d9b8be54ebef5 - -file_id: salta-20091205050816-atehe9u3hbg3yr96-1237 -hash: 584ee931558fdb216f1a91d64a5572f3b754b2be - -file_id: jujuy-20091205050816-atehe9u3hbg3yr96-793 -hash: 038f0f9a0607f9d6a3abfc3b860f1a0b419d44dd - -file_id: tel_aviv-20091205050816-atehe9u3hbg3yr96-943 -hash: 15c45ff5718c3eacad83607e10450a345e02b364 - -file_id: jerusalem-20091205050816-atehe9u3hbg3yr96-903 -hash: 15c45ff5718c3eacad83607e10450a345e02b364 - -file_id: sitka-20110926143221-du1vqyr0x805hhch-1 -hash: 0e52111b329dfb7fcdc10c89ebd189bd231e26b6 - -file_id: ojinaga-20100128032852-bq0mccr4li0x5216-1 -hash: d55895f337b3b2efb0ebe23d9e06c425812faab8 - -file_id: sakhalin-20091205050816-atehe9u3hbg3yr96-934 -hash: eaacb9021a2bfe735a8d2716c7c33cfd84b5d8f5 - -file_id: kaliningrad-20091205050816-atehe9u3hbg3yr96-1060 -hash: e3ea0f88fea9b2bb8f997375dbc99ffbf7d8772a - -file_id: anadyr-20091205050816-atehe9u3hbg3yr96-872 -hash: 4312bbed502c4efe0de03ff0313acec8b5b37e50 - -file_id: yap-20091205050816-atehe9u3hbg3yr96-1156 -hash: 934271411568813b8e40907e1a91270a88781f3a - -file_id: israel-20091205050816-atehe9u3hbg3yr96-1190 -hash: 15c45ff5718c3eacad83607e10450a345e02b364 - -file_id: test_docs.py-20091205050816-atehe9u3hbg3yr96-628 -hash: 1ffea8c4e66cba1fda31ca048e9c14ff8c174974 - -file_id: pangnirtung-20091205050816-atehe9u3hbg3yr96-821 -hash: cb0ebe360b17e8a08a62fb64c85afc05a137d62b - -file_id: central-20091205050816-atehe9u3hbg3yr96-1160 -hash: efdcc37cb2691f8d2d1cdd53dd212f0dc4bea28f - -file_id: saigon-20091205050816-atehe9u3hbg3yr96-933 -hash: 71f384fa4a6b0991a232da936c44e5e6dd5a286e - -file_id: series-20100128032852-bq0mccr4li0x5216-5 -hash: da39a3ee5e6b4b0d3255bfef95601890afd80709 - -file_id: jujuy-20091205050816-atehe9u3hbg3yr96-715 -hash: 038f0f9a0607f9d6a3abfc3b860f1a0b419d44dd - -file_id: cordoba-20091205050816-atehe9u3hbg3yr96-714 -hash: 2aa0d82eed460dffb4842d9528c492f25cc9d435 - -file_id: novosibirsk-20091205050816-atehe9u3hbg3yr96-920 -hash: 43c235431f670ccd48f0e8277bcdd7176da2c667 - -file_id: chihuahua-20091205050816-atehe9u3hbg3yr96-759 -hash: 8bf45181daed3af18b19b0a142ab7e95921daa21 - -file_id: manila-20091205050816-atehe9u3hbg3yr96-917 -hash: e82730569f30e3f7915b299b584c0824d479840f - -file_id: pyongyang-20091205050816-atehe9u3hbg3yr96-925 -hash: 98b82d54dcf8403215218aa13e075b2b291a33cd - -file_id: casey-20091205050816-atehe9u3hbg3yr96-858 -hash: d5d6310de0be8e4b9437e7fb543cb3345ee8f958 - -file_id: merida-20091205050816-atehe9u3hbg3yr96-807 -hash: fee1a166e2783c3c9daa28731a4bf442ea4c1ae4 - -file_id: tell_city-20091205050816-atehe9u3hbg3yr96-1224 -hash: e0b1a33b7218403e46fc358b34e324c0d93ac61f - -file_id: rankin_inlet-20091205050816-atehe9u3hbg3yr96-830 -hash: b3a1936d785d0d4de87376c18a76f5bb50efad30 - -file_id: kampala-20091205050816-atehe9u3hbg3yr96-684 -hash: 1270921877d3b668e0a903e4de25e40ec16ae88c - -file_id: dar_es_salaam-20091205050816-atehe9u3hbg3yr96-676 -hash: 5a05d04e831e82747808118c5668208d54b616cd - -file_id: easterisland-20091205050816-atehe9u3hbg3yr96-1005 -hash: 8a62ec93eb364b7ed03f92a926b5592765034474 - -file_id: harbin-20091205050816-atehe9u3hbg3yr96-896 -hash: a97a01f2cbbe572fe31ee8383ba5fd022be1c98d - -file_id: riyadh89-20091205050816-atehe9u3hbg3yr96-932 -hash: 38cd882a494ed321171aaa5776f9ac08dfef760d - -file_id: mendoza-20091205050816-atehe9u3hbg3yr96-805 -hash: 356a4f813e7dd0235fd4ba6ec9dc80c2d934f9b6 - -file_id: riyadh88-20091205050816-atehe9u3hbg3yr96-1115 -hash: bad82c8075857f8a0bab82dd8df80adb25cda117 - -file_id: karachi-20091205050816-atehe9u3hbg3yr96-906 -hash: ae7179941b3211b23bd98e1a17b83ab9f6462e30 - -file_id: newfoundland-20091205050816-atehe9u3hbg3yr96-1000 -hash: ff90d9bd226f5ff3d7e65aeae364c406c9d9ea4a - -file_id: seoul-20091205050816-atehe9u3hbg3yr96-936 -hash: 7881a7b34cd84348739368c7ef9faa6e05d2a51e - -file_id: mazatlan-20091205050816-atehe9u3hbg3yr96-804 -hash: 28399e14d5e56ba76c308994a6eb7fbc40d8ccae - -file_id: knox_in-20091205050816-atehe9u3hbg3yr96-795 -hash: a865f3d7347a2723c1f776b0e5bfd2d8985eff06 - -file_id: egypt-20091205050816-atehe9u3hbg3yr96-1176 -hash: 2c76400541f0098a1022db11790e890fa53a18d6 - -file_id: chuuk-20110926143221-du1vqyr0x805hhch-9 -hash: 934271411568813b8e40907e1a91270a88781f3a - -file_id: chicago-20091205050816-atehe9u3hbg3yr96-758 -hash: efdcc37cb2691f8d2d1cdd53dd212f0dc4bea28f - -file_id: yakutsk-20091205050816-atehe9u3hbg3yr96-953 -hash: c6bdee9f554641b18856cc0771115444e246afcc - -file_id: san_luis-20091205050816-atehe9u3hbg3yr96-1229 -hash: e1933b958c714f339fecf887b43e866a51621674 - -file_id: pohnpei-20110926143221-du1vqyr0x805hhch-5 -hash: 0f1d287b6b5b4056ca7af2ac4ab684b4492fb78f - -file_id: yekaterinburg-20091205050816-atehe9u3hbg3yr96-954 -hash: 0355a815815d3bef2d19e7aad9634e2794882fee - -file_id: davis-20091205050816-atehe9u3hbg3yr96-859 -hash: e17dcb1dc74228e45c789e88129227ab57696250 - -file_id: rok-20091205050816-atehe9u3hbg3yr96-1206 -hash: 7881a7b34cd84348739368c7ef9faa6e05d2a51e - -file_id: lower_princes-20110926143221-du1vqyr0x805hhch-2 -hash: 79a366cea621b863129c30cdf19fd7365f357dc4 - -file_id: catamarca-20091205050816-atehe9u3hbg3yr96-755 -hash: 3d3fccb1381201775cd06b9b038ec0af0b4f7051 - -file_id: istanbul-20091205050816-atehe9u3hbg3yr96-1058 -hash: 83f0a6c1dfcf31a637dac5cca7d214da6b98bf35 - -file_id: riyadh87-20091205050816-atehe9u3hbg3yr96-1114 -hash: 8f25c284c01812ce2d07238fcec0158f81f06027 - -file_id: hongkong-20091205050816-atehe9u3hbg3yr96-1187 -hash: 716a6408949c477b3adecbb60b94be5f44e462da - -file_id: montevideo-20091205050816-atehe9u3hbg3yr96-812 -hash: ffd8a530a148d3aafdccb503597af813ec8b1491 - -file_id: makassar-20091205050816-atehe9u3hbg3yr96-916 -hash: 7b00facef75ca6ac95b85c697b3e96291d1531a0 - -file_id: santiago-20091205050816-atehe9u3hbg3yr96-835 -hash: df864bcd66f0fbb50b69dcad8ddf62136ee41119 - -file_id: cordoba-20091205050816-atehe9u3hbg3yr96-761 -hash: 2aa0d82eed460dffb4842d9528c492f25cc9d435 - -file_id: stanley-20091205050816-atehe9u3hbg3yr96-967 -hash: e9643710a6cf96774f59b3e205524571237ac77e - -file_id: st_johns-20091205050816-atehe9u3hbg3yr96-840 -hash: ff90d9bd226f5ff3d7e65aeae364c406c9d9ea4a - -file_id: __init__.py-20091205050816-atehe9u3hbg3yr96-608 -hash: 69c17ad4ec0f7203a90cd9b0cac1261975492af5 - -file_id: kamchatka-20091205050816-atehe9u3hbg3yr96-905 -hash: 8c4deffc74a524a5caeab1f54c36b75661b325ed - -file_id: krasnoyarsk-20091205050816-atehe9u3hbg3yr96-909 -hash: ca8d4859e159241533cd01a261b33b3baaaaaafa - -file_id: honolulu-20091205050816-atehe9u3hbg3yr96-1130 -hash: d55844608a7ab459124b8ce4b1b970896b7aa5d5 - -file_id: riyadh87-20091205050816-atehe9u3hbg3yr96-930 -hash: 8f25c284c01812ce2d07238fcec0158f81f06027 - -file_id: ushuaia-20091205050816-atehe9u3hbg3yr96-721 -hash: 5356a411eaa7e605677ab27ec02af9ff8718808b - -file_id: juneau-20091205050816-atehe9u3hbg3yr96-794 -hash: b9b24fa1062691230429280d2874917856be9e86 - -file_id: macquarie-20110926143221-du1vqyr0x805hhch-7 -hash: 85449e0a951560fede8639f879c0694c0a15e3fd - -file_id: san_juan-20091205050816-atehe9u3hbg3yr96-719 -hash: 2217378699088989c5cbc517a76e74180c7bc9a5 - -file_id: ujung_pandang-20091205050816-atehe9u3hbg3yr96-947 -hash: 7b00facef75ca6ac95b85c697b3e96291d1531a0 - -file_id: continental-20091205050816-atehe9u3hbg3yr96-1004 -hash: df864bcd66f0fbb50b69dcad8ddf62136ee41119 - -file_id: gaza-20091205050816-atehe9u3hbg3yr96-895 -hash: b15e86f6cf3ea03e965838906574ebe7c7a77886 - -file_id: localtime-20091205050816-atehe9u3hbg3yr96-1216 -hash: 0185b7014bc93b42ba8674be7796839a80febaba - -file_id: metlakatla-20110926143221-du1vqyr0x805hhch-10 -hash: 9cd3aafab64db0e303864ca9741573804b88ae21 - -file_id: kosrae-20091205050816-atehe9u3hbg3yr96-1133 -hash: 0a483ffa85e9bf3e5acb1298278db523687e83d8 - -file_id: hong_kong-20091205050816-atehe9u3hbg3yr96-897 -hash: 716a6408949c477b3adecbb60b94be5f44e462da - -file_id: indianastarke-20091205050816-atehe9u3hbg3yr96-1164 -hash: a865f3d7347a2723c1f776b0e5bfd2d8985eff06 - -file_id: apia-20091205050816-atehe9u3hbg3yr96-1117 -hash: cdc3277349437457ba0191bb950820fc80247ca1 - -file_id: iqaluit-20091205050816-atehe9u3hbg3yr96-791 -hash: 938a9ca9e39fc72218d9d9e9c97e70e2fbc8bf90 - -file_id: easter-20091205050816-atehe9u3hbg3yr96-1120 -hash: 8a62ec93eb364b7ed03f92a926b5592765034474 - -file_id: goose_bay-20091205050816-atehe9u3hbg3yr96-779 -hash: 74c0b771f29cf8521278b48db62564c5667ce5e9 - -file_id: truk-20091205050816-atehe9u3hbg3yr96-1153 -hash: 934271411568813b8e40907e1a91270a88781f3a - -file_id: la_rioja-20091205050816-atehe9u3hbg3yr96-716 -hash: c7b7f1a30a622473d9ab1ddf51bf10de2f183778 - -file_id: taipei-20091205050816-atehe9u3hbg3yr96-939 -hash: 8ffa18d861f043aa3b90bb724b80e57f2215db44 - -file_id: bajasur-20091205050816-atehe9u3hbg3yr96-1111 -hash: 28399e14d5e56ba76c308994a6eb7fbc40d8ccae - -file_id: pkginfo-20091205050816-atehe9u3hbg3yr96-616 -hash: c8725ed85f1a67ed80a5cf93b46da22e20971406 - -file_id: irkutsk-20091205050816-atehe9u3hbg3yr96-899 -hash: 334f5e997570d578ef0dbabff3f2849022f55a30 - -file_id: fiji-20091205050816-atehe9u3hbg3yr96-1124 -hash: 4e9012b173a7cd932f5b8adbccb0c343f35bc07e - -file_id: tbilisi-20091205050816-atehe9u3hbg3yr96-941 -hash: cc33165c8d9d5478a9b40a103b944594967da763 - -file_id: mariehamn-20091205050816-atehe9u3hbg3yr96-1068 -hash: e564770bfdde8f525a7b08bba53bf5a9e654b9e4 - -file_id: magadan-20091205050816-atehe9u3hbg3yr96-915 -hash: d08e0d1c4d9d648ad2beef60ddea38aba517f035 - -file_id: tzfile.py-20091205050816-atehe9u3hbg3yr96-1219 -hash: 4047474e30e9b7e24d91c82b4cc84535eeef4101 - -file_id: changes.txt-20091205050816-atehe9u3hbg3yr96-612 -hash: 64a9900722dee92eaefcbe1b7e645918a06ba9cb - -file_id: comodrivadavia-20091205050816-atehe9u3hbg3yr96-713 -hash: 3d3fccb1381201775cd06b9b038ec0af0b4f7051 - -file_id: dacca-20091205050816-atehe9u3hbg3yr96-889 -hash: 09389a490dce3881670cf914895905a2bca220d4 - -file_id: dili-20091205050816-atehe9u3hbg3yr96-892 -hash: ecfd1567a59c87bd7c4f0eb6604980b0b2dee4bc - -file_id: cancun-20091205050816-atehe9u3hbg3yr96-753 -hash: b787403882b0573f7266f0c62bbac4c825a50b03 - -file_id: nouakchott-20091205050816-atehe9u3hbg3yr96-703 -hash: 205b4d97c685e06fcb81e32910dc7c0834ac961f - -file_id: tunis-20091205050816-atehe9u3hbg3yr96-709 -hash: c117ca0f65ed45b8f18c9a803ed69bbc4dcb432f - -file_id: omsk-20091205050816-atehe9u3hbg3yr96-921 -hash: 8d47157b625acb719cd0f0394edf650b2bae8253 - -file_id: helsinki-20091205050816-atehe9u3hbg3yr96-1056 -hash: e564770bfdde8f525a7b08bba53bf5a9e654b9e4 - -file_id: iran-20091205050816-atehe9u3hbg3yr96-1189 -hash: 925984f101ce8e77bc861798048af4ac77bd7b7f - -file_id: riyadh89-20091205050816-atehe9u3hbg3yr96-1116 -hash: 38cd882a494ed321171aaa5776f9ac08dfef760d - -file_id: rosario-20091205050816-atehe9u3hbg3yr96-834 -hash: 2aa0d82eed460dffb4842d9528c492f25cc9d435 - -file_id: jayapura-20091205050816-atehe9u3hbg3yr96-902 -hash: 2d085197fcfbd8c8212dd263d470c2d27f6e54ea - -file_id: cambridge_bay-20091205050816-atehe9u3hbg3yr96-751 -hash: b9311eaa6d136dfc6a9ed89c0aee0d81c6a58bad - -file_id: tzinfo.py-20091205050816-atehe9u3hbg3yr96-611 -hash: b475fdd79ddd728f2061dd6bd1e4223da1fd4189 - -file_id: setup.py-20091205050816-atehe9u3hbg3yr96-615 -hash: 0977a463d0aceec25c6d61f266ac493743e7ef3d - -file_id: rio_gallegos-20091205050816-atehe9u3hbg3yr96-718 -hash: ff512a3ed5fc48c59cc734bd819e28da7a0d9613 - -file_id: wsu-20091205050816-atehe9u3hbg3yr96-1212 -hash: b7400f7ca9c83c62f116252c6479efa244ae3307 - -file_id: novokuznetsk-20100107111112-mkszjvlop7qdlkds-1 -hash: 951f67b1814a7ebdcd3c757803dccc46012fb3f5 - -file_id: tehran-20091205050816-atehe9u3hbg3yr96-942 -hash: 925984f101ce8e77bc861798048af4ac77bd7b7f - -file_id: riyadh88-20091205050816-atehe9u3hbg3yr96-931 -hash: bad82c8075857f8a0bab82dd8df80adb25cda117 - -file_id: mogadishu-20091205050816-atehe9u3hbg3yr96-698 -hash: ff1905dad973cb3ae6af9309108c7fc04c0e1bf9 - -file_id: sources.txt-20091205050816-atehe9u3hbg3yr96-643 -hash: 4f4ecb94e7b1ecfb9a7263e03a575173e7385f65 - -file_id: readme.txt-20091205050816-atehe9u3hbg3yr96-614 -hash: 59d90b2f5089234e5c2bb52dadb71f481a37a27a - -file_id: nairobi-20091205050816-atehe9u3hbg3yr96-700 -hash: 5784170fbd41a93afde6956b1bbfb65f6a4f92b5 - -file_id: iso3166.tab-20091205050816-atehe9u3hbg3yr96-1215 -hash: 8ab8a1fa1c120f0c3e5594af6caef4c8fa49b258 - -file_id: kralendijk-20110926143221-du1vqyr0x805hhch-8 -hash: 79a366cea621b863129c30cdf19fd7365f357dc4 - -file_id: moscow-20091205050816-atehe9u3hbg3yr96-1071 -hash: b7400f7ca9c83c62f116252c6479efa244ae3307 - -file_id: exceptions.py-20110926143221-du1vqyr0x805hhch-6 -hash: 9ef347529abcc5be1cd0987a674e3c534cf9e542 - -file_id: timbuktu-20091205050816-atehe9u3hbg3yr96-707 -hash: 785226f3f7ac8d30fb0ab56f6c981ff5e21278ab - -file_id: mendoza-20091205050816-atehe9u3hbg3yr96-717 -hash: 356a4f813e7dd0235fd4ba6ec9dc80c2d934f9b6 - -file_id: vientiane-20091205050816-atehe9u3hbg3yr96-951 -hash: cae3c68dce8984abe06cc554ec4404791c32d7a6 - -file_id: changelog-20091205050816-atehe9u3hbg3yr96-622 -hash: 62530fe9e30f54a45098272bc75362cd5b0a91ef - -file_id: bahia_banderas-20110926143221-du1vqyr0x805hhch-4 -hash: 1935c93444197e099a137054360d88942ebd07ce - -file_id: caracas-20091205050816-atehe9u3hbg3yr96-754 -hash: 84fa7548397ebb9b0c59241cb77fabb06d4cd323 - -file_id: zone.tab-20091205050816-atehe9u3hbg3yr96-1218 -hash: d8835a3863fdc1f77e759c844fd467eded645e8c - -file_id: conakry-20091205050816-atehe9u3hbg3yr96-674 -hash: c93fe8b6446231d658587b4488cec424b105ee78 - -file_id: bamako-20091205050816-atehe9u3hbg3yr96-664 -hash: 785226f3f7ac8d30fb0ab56f6c981ff5e21278ab diff -Nru python-tz-2011k/.bzr/README python-tz-2011h/.bzr/README --- python-tz-2011k/.bzr/README 2011-10-20 19:15:57.000000000 +0000 +++ python-tz-2011h/.bzr/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -This is a Bazaar control directory. -Do not change any files in this directory. -See http://bazaar.canonical.com/ for more information about Bazaar. diff -Nru python-tz-2011k/debian/changelog python-tz-2011h/debian/changelog --- python-tz-2011k/debian/changelog 2012-02-28 15:36:56.000000000 +0000 +++ python-tz-2011h/debian/changelog 2012-03-23 01:20:34.000000000 +0000 @@ -1,39 +1,35 @@ -python-tz (2011k-0ubuntu5) precise; urgency=low +python-tz (2011h-1ppa1) precise; urgency=low - * Disable testsuite + * Build Debian version including python3-tz package. + * debian/control: bump standards version to 3.9.3 - -- Chuck Short Tue, 28 Feb 2012 10:36:56 -0500 + -- Thomas Kluyver Fri, 23 Mar 2012 01:17:18 +0000 -python-tz (2011k-0ubuntu4) precise; urgency=low +python-tz (2011h-1) unstable; urgency=low - * debian/rules: Run testsuite. + * Team upload. - -- Chuck Short Tue, 28 Feb 2012 10:32:00 -0500 + [ 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. -python-tz (2011k-0ubuntu3) precise; urgency=low - - [ Forest Bond ] - * Add patch samoa-idl (LP: #885163). - - -- Andreas Hasenack Fri, 06 Jan 2012 10:29:22 -0800 - -python-tz (2011k-0ubuntu2) precise; urgency=low - - * debian/patches/tzdata: Restore patch to use tzdata package for - timezone information. This was lost during the last Debian merge. - (LP: #884890). - - -- Barry Warsaw Tue, 08 Nov 2011 15:47:51 -0500 - -python-tz (2011k-0ubuntu1) precise; urgency=low - - * New upstream release. - - Debian testing/unstable version 2011h is no longer available upstream. - * Merge with Debian testing. Remaining Ubuntu changes: - - Switch to dh_python2 (LP: #831411, Closes: #617041). - - debian/control: build-depend on python-all (not -dev). + [ 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. - -- Barry Warsaw Fri, 21 Oct 2011 14:01:38 -0400 + -- Arnaud Fontaine Fri, 21 Oct 2011 14:53:37 +0900 python-tz (2011h-0.1) unstable; urgency=low @@ -42,15 +38,6 @@ -- Yaroslav Halchenko Tue, 13 Sep 2011 20:04:04 -0400 -python-tz (2010b-1ubuntu1) oneiric; urgency=low - - * debian/patches/tzdata: remove import of pkg_resources (Closes: #599047) - * Switch to dh_python2 (LP: #831411, Closes: #617041). - * Switch to source format 3.0 (quilt) - * debian/control: build-depend on python-all (not -dev). - - -- Gediminas Paulauskas Tue, 23 Aug 2011 18:14:25 +0300 - python-tz (2010b-1) unstable; urgency=low * New upstream release. diff -Nru python-tz-2011k/debian/clean python-tz-2011h/debian/clean --- python-tz-2011k/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ python-tz-2011h/debian/clean 2011-10-21 07:01:44.000000000 +0000 @@ -0,0 +1 @@ +pytz.egg-info/* diff -Nru python-tz-2011k/debian/control python-tz-2011h/debian/control --- python-tz-2011k/debian/control 2012-01-06 18:29:17.000000000 +0000 +++ python-tz-2011h/debian/control 2012-03-23 01:19:57.000000000 +0000 @@ -1,14 +1,20 @@ Source: python-tz Section: python Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian/Ubuntu Zope Team -Uploaders: Brian Sutherland , Fabio Tranchitella -Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~), python-setuptools -Standards-Version: 3.9.2 +Maintainer: Debian/Ubuntu Zope Team +Uploaders: Brian Sutherland , + Fabio Tranchitella +Build-Depends: debhelper (>= 7.0.50~), + python-all (>= 2.6.6-3~), + python3-all, + python-setuptools, + python3-setuptools +Standards-Version: 3.9.3 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 @@ -19,3 +25,15 @@ 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. diff -Nru python-tz-2011k/debian/copyright python-tz-2011h/debian/copyright --- python-tz-2011k/debian/copyright 2012-01-06 18:29:07.000000000 +0000 +++ python-tz-2011h/debian/copyright 2011-10-21 05:18:36.000000000 +0000 @@ -1,60 +1,31 @@ -This package was debianized by Brian Sutherland on -Tue, 8 Feb 2005 02:14:33 +0100. +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174 +Upstream-Name: pytz +Upstream-Contact: Stuart Bishop +Source: http://pypi.python.org/pypi/pytz/ + +Files: * +Copyright: (c) 2003-2008 Stuart Bishop +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +Files: pytz/zoneinfo/* +Copyright: Arthur David Olson et.al. +License: public-domain +Comment: excluded from binary package -It was downloaded from http://pypi.python.org/pypi/pytz/ - -Copyright: - -Upstream Author: Stuart Bishop - -This package is the result of an automatic generation from the Olsen database -(available from ftp://elsie.nci.nih.gov/pub). This means that there are two -licenses involved, that of the original distribution and the automatic -generation code. Fortunately both are BSD style. - -Both are included here as they are quite different from the standard BSD style -license distributed with Debian. - - -License: - -The files of the original database distribution contain this license text: - -/* -** Copyright (c) 1989 The Regents of the University of California. -** All rights reserved. -** -** Redistribution and use in source and binary forms are permitted -** provided that the above copyright notice and this paragraph are -** duplicated in all such forms and that any documentation, -** advertising materials, and other materials related to such -** distribution and use acknowledge that the software was developed -** by the University of California, Berkeley. The name of the -** University may not be used to endorse or promote products derived -** from this software without specific prior written permission. -** THIS SOFTWARE IS PROVIDED ``AS IS' AND WITHOUT ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -*/ - -And the automatic generation code license is: - -Copyright (c) 2003-2008 Stuart Bishop - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff -Nru python-tz-2011k/debian/patches/debian-changes-2011k-0ubuntu2 python-tz-2011h/debian/patches/debian-changes-2011k-0ubuntu2 --- python-tz-2011k/debian/patches/debian-changes-2011k-0ubuntu2 2012-01-06 18:29:07.000000000 +0000 +++ python-tz-2011h/debian/patches/debian-changes-2011k-0ubuntu2 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -Description: Upstream changes introduced in version 2011k-0ubuntu2 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - python-tz (2011k-0ubuntu2) precise; urgency=low - . - * debian/patches/tzdata: Restore patch to use tzdata package for - timezone information. This was lost during the last Debian merge. - (LP: #884890). - . - The person named in the Author field signed this changelog entry. -Author: Barry Warsaw -Bug-Ubuntu: https://bugs.launchpad.net/bugs/884890 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- python-tz-2011k.orig/pytz/__init__.py -+++ python-tz-2011k/pytz/__init__.py -@@ -9,7 +9,7 @@ on how to use these modules. - ''' - - # The Olson database is updated several times a year. --OLSON_VERSION = '2011h' -+OLSON_VERSION = '2011k' - VERSION = OLSON_VERSION - # Version format for a patch release - only one so far. - #VERSION = OLSON_VERSION + '.2' diff -Nru python-tz-2011k/debian/patches/samoa-idl python-tz-2011h/debian/patches/samoa-idl --- python-tz-2011k/debian/patches/samoa-idl 2012-01-06 18:29:17.000000000 +0000 +++ python-tz-2011h/debian/patches/samoa-idl 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -=== modified file 'pytz/pytz/tests/test_tzinfo.py' ---- pytz.orig/pytz/tests/test_tzinfo.py 2011-11-04 09:32:28 +0000 -+++ pytz/pytz/tests/test_tzinfo.py 2011-11-04 09:59:20 +0000 -@@ -533,6 +533,24 @@ - } - - -+class SamoaInternationalDateLineChange(USEasternDSTStartTestCase): -+ # At the end of 2011, Samoa will switch from being east of the -+ # international dateline to the west. There will be no Dec 30th -+ # 2011 and it will switch from UTC-11 to UTC+13. -+ tzinfo = pytz.timezone('Pacific/Apia') -+ transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC) -+ before = { -+ 'tzname': 'WSDT', -+ 'utcoffset': timedelta(hours=-10), -+ 'dst': timedelta(hours=1), -+ } -+ after = { -+ 'tzname': 'WSDT', -+ 'utcoffset': timedelta(hours=14), -+ 'dst': timedelta(hours=1), -+ } -+ -+ - class ReferenceUSEasternDSTStartTestCase(USEasternDSTStartTestCase): - tzinfo = reference.Eastern - def test_arithmetic(self): - -=== modified file 'src/pytz/tzfile.py' ---- src/pytz/tzfile.py 2011-02-08 10:18:52 +0000 -+++ src/pytz/tzfile.py 2011-11-04 10:32:42 +0000 -@@ -97,7 +97,9 @@ - break - dst = inf[0] - prev_inf[0] # dst offset - -- if dst <= 0: # Bad dst? Look further. -+ # Bad dst? Look further. DST > 24 hours happens when -+ # a timzone has moved across the international dateline. -+ if dst <= 0 or dst > 3600*3: - for j in range(i+1, len(transitions)): - stdinf = ttinfo[lindexes[j]] - if not stdinf[1]: - diff -Nru python-tz-2011k/debian/patches/series python-tz-2011h/debian/patches/series --- python-tz-2011k/debian/patches/series 2012-01-06 18:29:17.000000000 +0000 +++ python-tz-2011h/debian/patches/series 2011-10-21 05:18:36.000000000 +0000 @@ -1,3 +1 @@ tzdata -samoa-idl -debian-changes-2011k-0ubuntu2 diff -Nru python-tz-2011k/debian/rules python-tz-2011h/debian/rules --- python-tz-2011k/debian/rules 2012-02-28 15:36:36.000000000 +0000 +++ python-tz-2011h/debian/rules 2011-10-21 07:05:09.000000000 +0000 @@ -1,15 +1,40 @@ #!/usr/bin/make -f +PACKAGE=python-tz +PACKAGE_PYTHON3=python3-tz + +PYVERS:=$(shell pyversions -r) +PY3VERS:=$(shell py3versions -r) + %: - dh --with python2 $@ + 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 - -#override_dh_auto_test: -# set -e ; for pyversion in $(shell pyversions -r); do $$pyversion $(CURDIR)/pytz/tests/test_tzinfo.py ; done + # remove zoneinfo, our patch to pytz makes it use the one from tzdata + rm -rf debian/python*-tz/usr/lib/python*/*-packages/pytz/zoneinfo diff -Nru python-tz-2011k/debian/test-pytz python-tz-2011h/debian/test-pytz --- python-tz-2011k/debian/test-pytz 2012-01-06 18:29:07.000000000 +0000 +++ python-tz-2011h/debian/test-pytz 2011-10-21 06:23:46.000000000 +0000 @@ -13,5 +13,5 @@ tests += mod_tests if not errors: - print "Ran %s tests successfully." % tests + print("Ran %s tests successfully." % tests) sys.exit(errors) diff -Nru python-tz-2011k/debian/watch python-tz-2011h/debian/watch --- python-tz-2011k/debian/watch 2012-01-06 18:29:07.000000000 +0000 +++ python-tz-2011h/debian/watch 2011-10-21 05:52:08.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://pypi.python.org/pypi/pytz http://pypi.python.org/packages/source/p/pytz/pytz-(.*).tar.gz#md5=.* +http://pypi.python.org/packages/source/p/pytz/pytz-(.*).tar.gz diff -Nru python-tz-2011k/pytz.egg-info/SOURCES.txt python-tz-2011h/pytz.egg-info/SOURCES.txt --- python-tz-2011k/pytz.egg-info/SOURCES.txt 2011-10-21 18:38:24.000000000 +0000 +++ python-tz-2011h/pytz.egg-info/SOURCES.txt 2011-06-27 13:52:27.000000000 +0000 @@ -2,7 +2,6 @@ LICENSE.txt MANIFEST.in README.txt -setup.cfg setup.py pytz/__init__.py pytz/exceptions.py