Cygwin: tzmap-from-unicode.org: drop "E. Europe Standard Time" default

E. Europe Standard Time is available in the unicode.org windowsZones.xml
file, so we can drop the default handling.

Fix a few comments.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

diff --git a/winsup/utils/tzmap-from-unicode.org b/winsup/utils/tzmap-from-unicode.org
index 2264f02683d3d90242d98058c84b13ae3a72510a..6b7907a320695cdc6567ecde256c6597c3a32c10 100755 (executable)
--- a/winsup/utils/tzmap-from-unicode.org
+++ b/winsup/utils/tzmap-from-unicode.org
@@ -24,14 +24,15 @@ echo "   This table maps Windows timezone keynames and countries per ISO 3166-1
 echo "   POSIX-compatible timezone IDs."
 echo ""
 echo "   The mapping from unicode.org is just a bit incomplete.  It doesn't contain"
-echo "   a few timezones available on Windows 8.1:"
+echo "   some (deprecated) timezones available since Windows 8.1:"
 echo ""
-echo "    E. Europe Standard Time"
 echo "    Mid-Atlantic Standard Time"
 echo "    Kamchatka Standard Time"
 echo ""
 echo "  as well as a few combinations which got a new Windows timezone name"
+echo "  but may still be in use somewhere..."
 echo ""
+echo "    E. Europe Standard Time/CY"
 echo "    Eastern Standard Time/TC"
 echo "    Egypt Standard Time/PS"
 echo "    Greenwich Standard Time/EH"
@@ -53,7 +54,6 @@ 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"E. Europe Standard Time", L"", L"Asia/Nicosia" },'
   echo '  { L"E. Europe Standard Time", L"CY", L"Asia/Nicosia" },'
   echo '  { L"Eastern Standard Time", L"TC", L"America/Grand_Turk" },'
   echo '  { L"Egypt Standard Time", L"PS", L"Asia/Gaza Asia/Hebron" },'