localedata: remove timezone information [BZ #18525]

as discussed in the thread starting at

https://sourceware.org/ml/libc-alpha/2015-06/msg00098.html

it looks like the best options is to remove locale timezone information
from locales which currently provide it (in incomplete or incorrect
fashion) rather than to start duplicating tzdata info in glibc.

diff --git a/ChangeLog b/ChangeLog
index 54a0ab3..a228926 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-05  Marko Myllynen  <myllynen@redhat.com>
+
+       [BZ #18525]
+       * locales/km_KH: Remove timezone definition.
+       * locales/lo_LA: Likewise.
+       * locales/my_MM: Likewise.
+       * locales/nan_TW@latin: Likewise.
+       * locales/th_TH: Likewise.
+       * locales/uk_UA: Likewise.
+
 2015-08-05  Daniel Marjamäki  <daniel.marjamaki@evidente.se>
 
        [BZ #18265]

diff --git a/NEWS b/NEWS
index d011ce6..6e0726c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,7 @@ using `glibc' in the "product" field.
 Version 2.23
 
 * The following bugs are resolved with this release:
-  18265
+  18265, 18525.
 \f
 Version 2.22
 

diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH
index 5563659..aaef20d 100644 (file)
--- a/localedata/locales/km_KH
+++ b/localedata/locales/km_KH
@@ -1838,8 +1838,6 @@ am_pm    "<U1796><U17D2><U179A><U17B9><U1780>";"<U179B><U17D2><U1784><U17B6><U17
 %date_fmt       "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
 %<U0020><U0025><U0045><U0079><U0020><U0025><U0048><U003A><U0025><U004D>/
 %<U003A><U0025><U0053><U0020><U0025><U005A>"
-% ICT-7ICT-7
-%timezone      "<U0049><U0043><U0054><U002D><U0037><U0049><U0043><U0054><U002d><U0037>"
 
 END LC_TIME
 

diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA
index c584877..eba90ce 100644 (file)
--- a/localedata/locales/lo_LA
+++ b/localedata/locales/lo_LA
@@ -716,8 +716,6 @@ era_d_t_fmt     "<U0EA7><U0EB1><U0E99>%A<U0E97><U0EB5><U0EC8><U0020>%e<U0020>%B<
 date_fmt       "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
 <U0020><U0025><U0045><U0079><U0020><U0025><U0048><U003A><U0025><U004D>/
 <U003A><U0025><U0053><U0020><U0025><U005A>"
-% ICT-7ICT-7
-timezone       "<U0049><U0043><U0054><U002D><U0037><U0049><U0043><U0054><U002d><U0037>"
 END LC_TIME
 
 LC_MESSAGES

diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM
index d9a2db1..165519a 100644 (file)
--- a/localedata/locales/my_MM
+++ b/localedata/locales/my_MM
@@ -157,9 +157,6 @@ t_fmt       "<U0025><U004F><U0049><U003A><U0025><U004F><U004D><U003A><U0025><U00
 % %OI:%OM:%OS %p
 t_fmt_ampm  "<U0025><U004F><U0049><U003A><U0025><U004F><U004D><U003A><U0025><U004F><U0053><U0020><U0025><U0070>"
 
-% MMT-6.5MMT-6.5
-timezone "<U004D><U004D><U0054><U002D><U0036><U002E><U0035><U004D><U004D><U0054><U002D><U0036><U002E><U0035>"
-
 alt_digits  "<U1040><U1040>";/
                "<U1040><U1041>";/
                "<U1040><U1042>";/

diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index a1e7d49..eb2b292 100644 (file)
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -136,7 +136,6 @@ d_fmt       "<U0025><U0046>"
 t_fmt       "<U0025><U0072>"
 am_pm       "<U0074><U00E9><U006E><U0067><U002D><U0070><U006F><U0358>";"<U0113><U002D><U0070><U006F><U0358>"
 t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
-timezone    "<U0054><U0053><U0054><U002D><U0038>"
 date_fmt    "<U0025><U0059><U0020><U0025><U0062><U0020><U0025><U0064><U0020><U0028><U0025><U0061><U0029><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
 END LC_TIME
 

diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH
index 88c3637..5b8c41b 100644 (file)
--- a/localedata/locales/th_TH
+++ b/localedata/locales/th_TH
@@ -911,8 +911,6 @@ era_d_t_fmt     "<U0E27><U0E31><U0E19>%A<U0E17><U0E35><U0E48><U0020>%e<U0020>%B<
 date_fmt       "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
 <U0020><U0025><U0045><U0079><U0020><U0025><U0048><U003A><U0025><U004D>/
 <U003A><U0025><U0053><U0020><U0025><U005A>"
-% ICT-7ICT-7
-timezone       "<U0049><U0043><U0054><U002D><U0037><U0049><U0043><U0054><U002d><U0037>"
 END LC_TIME
 
 LC_MESSAGES

diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA
index 511f004..5e58043 100644 (file)
--- a/localedata/locales/uk_UA
+++ b/localedata/locales/uk_UA
@@ -964,31 +964,6 @@ first_weekday 2
 % Define the first workday relative to the <week> keyword
 first_workday 2
 
-% Zymovyj CHas (winter time) or z.ch. (or nothing)
-% Litnij CHas (summer time) or l.ch.
-%
-% ( or EET/EEST (Easter Europe [Summer] Time) )
-% ( or Europe/Kyiv (or Kiev, in Russian) )
-%
-% Format:
-%
-% <ZoneName><Offset><ZoneName><Offset>,<rule>,<rule>[,...]
-%
-%  ZoneName - at least 3 letters, up to 10
-%  Offset - (+|-)hh[:mm[:ss]]
-%     - - time zone is east of Prime Meridian
-%     + - time zone is west of Prime Meridian
-%  rule: <date>[/time[/year]]
-%   date:
-%     J<JulianDay> , 1-365 (without 29.02)
-%     <JulianDay> , 0-364 (without 29.02)
-%     M<m>.<n>.<d> - m - month(1-12)
-%                    n - week(1-5)
-%                    d - day of week(0-7), day zero and day seven is Sunday
-%   time - the same as <offset> (but without leading +/-)
-%
-timezone "<U0437><U002E><U0447><U002E><U002D><U0030><U0032><U003A><U0030><U0030><U043B><U002E><U0447><U002E><U002D><U0030><U0033><U003A><U0030><U0030><U002C><U004D><U0033><U002E><U0035><U002E><U0030><U002F><U0030><U0033><U003A><U0030><U0030><U002C><U004D><U0031><U0030><U002E><U0035><U002E><U0030><U002F><U0030><U0034><U003A><U0030><U0030>"
-
 % Example:
 %
 %           traven`         cherven`