From 68994d682802cf18e71ec3d9e811c232ded47225 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 21 Apr 2015 14:29:01 +0200 Subject: [PATCH] Asia/Calcutta -> Asia/Kolkata (not on unicode.org) * tzmap-from-unicode.org: Convert Calcutta to Kolkata. * tzmap.h: Regenerate. Signed-off-by: Corinna Vinschen --- winsup/utils/ChangeLog | 5 +++++ winsup/utils/tzmap-from-unicode.org | 1 + winsup/utils/tzmap.h | 11 +++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index ef6d32e7d..bfdb42ae6 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2015-04-21 Corinna Vinschen + + * tzmap-from-unicode.org: Convert Calcutta to Kolkata. + * tzmap.h: Regenerate. + 2015-02-28 Corinna Vinschen * getfacl.c (usage): Change --all to --access, --dir to --default. diff --git a/winsup/utils/tzmap-from-unicode.org b/winsup/utils/tzmap-from-unicode.org index a155312a8..e169ee7a7 100755 --- a/winsup/utils/tzmap-from-unicode.org +++ b/winsup/utils/tzmap-from-unicode.org @@ -64,6 +64,7 @@ echo "{" wget -O - "${ZONES_FILE}" | \ { sed -n -e 's#territory="001"#territory=""# + s#Asia/Calcutta#Asia/Kolkata# s#.*mapZone other=\("[^"]*"\) territory=\("[^"]*"\) type=\("[^"]*"\).*# { L\1, L\2, L\3 },#p' echo ' { L"Armenian Standard Time", L"AM", L"Asia/Yerevan" },' echo ' { L"Central Europe Standard Time", L"CS", L"Europe/Belgrade" },' diff --git a/winsup/utils/tzmap.h b/winsup/utils/tzmap.h index dd4f8c0e4..31a83c96d 100644 --- a/winsup/utils/tzmap.h +++ b/winsup/utils/tzmap.h @@ -134,6 +134,7 @@ struct { L"Central Pacific Standard Time", L"AU", L"Antarctica/Macquarie" }, { L"Central Pacific Standard Time", L"FM", L"Pacific/Ponape Pacific/Kosrae" }, { L"Central Pacific Standard Time", L"NC", L"Pacific/Noumea" }, + { L"Central Pacific Standard Time", L"PG", L"Pacific/Bougainville" }, { L"Central Pacific Standard Time", L"SB", L"Pacific/Guadalcanal" }, { L"Central Pacific Standard Time", L"VU", L"Pacific/Efate" }, { L"Central Pacific Standard Time", L"ZZ", L"Etc/GMT-11" }, @@ -143,7 +144,7 @@ struct { L"Central Standard Time", L"US", L"America/Chicago America/Indiana/Knox America/Indiana/Tell_City America/Menominee America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem" }, { L"Central Standard Time", L"ZZ", L"CST6CDT" }, { L"Central Standard Time (Mexico)", L"", L"America/Mexico_City" }, - { L"Central Standard Time (Mexico)", L"MX", L"America/Mexico_City America/Bahia_Banderas America/Cancun America/Merida America/Monterrey" }, + { L"Central Standard Time (Mexico)", L"MX", L"America/Mexico_City America/Bahia_Banderas America/Merida America/Monterrey" }, { L"China Standard Time", L"", L"Asia/Shanghai" }, { L"China Standard Time", L"CN", L"Asia/Shanghai" }, { L"China Standard Time", L"HK", L"Asia/Hong_Kong" }, @@ -179,6 +180,8 @@ struct { L"Eastern Standard Time", L"TC", L"America/Grand_Turk" }, { L"Eastern Standard Time", L"US", L"America/New_York America/Detroit America/Indiana/Petersburg America/Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticello America/Louisville" }, { L"Eastern Standard Time", L"ZZ", L"EST5EDT" }, + { L"Eastern Standard Time (Mexico)", L"", L"America/Cancun" }, + { L"Eastern Standard Time (Mexico)", L"MX", L"America/Cancun" }, { L"Egypt Standard Time", L"", L"Africa/Cairo" }, { L"Egypt Standard Time", L"EG", L"Africa/Cairo" }, { L"Egypt Standard Time", L"PS", L"Asia/Gaza Asia/Hebron" }, @@ -236,8 +239,8 @@ struct { L"Hawaiian Standard Time", L"UM", L"Pacific/Johnston" }, { L"Hawaiian Standard Time", L"US", L"Pacific/Honolulu" }, { L"Hawaiian Standard Time", L"ZZ", L"Etc/GMT+10" }, - { L"India Standard Time", L"", L"Asia/Calcutta" }, - { L"India Standard Time", L"IN", L"Asia/Calcutta" }, + { L"India Standard Time", L"", L"Asia/Kolkata" }, + { L"India Standard Time", L"IN", L"Asia/Kolkata" }, { L"Iran Standard Time", L"", L"Asia/Tehran" }, { L"Iran Standard Time", L"IR", L"Asia/Tehran" }, { L"Israel Standard Time", L"", L"Asia/Jerusalem" }, @@ -507,7 +510,7 @@ struct { L"West Pacific Standard Time", L"FM", L"Pacific/Truk" }, { L"West Pacific Standard Time", L"GU", L"Pacific/Guam" }, { L"West Pacific Standard Time", L"MP", L"Pacific/Saipan" }, - { L"West Pacific Standard Time", L"PG", L"Pacific/Port_Moresby Pacific/Bougainville" }, + { L"West Pacific Standard Time", L"PG", L"Pacific/Port_Moresby" }, { L"West Pacific Standard Time", L"ZZ", L"Etc/GMT-10" }, { L"Yakutsk Standard Time", L"", L"Asia/Yakutsk" }, { L"Yakutsk Standard Time", L"RU", L"Asia/Yakutsk Asia/Khandyga" },