From d66bd8983c68d2fd6301ae9ba083b0fdad9d5bc6 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Sat, 20 Dec 2014 17:46:09 +0100
Subject: Update Locations.xml.in for timezone changes

Taken from libgweather commit: cda0d19687d61b73a162b05b06c9892973a0a598
From: Vincent Untz <vuntz@gnome.org>
---
 data/Locations.xml.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/Locations.xml.in b/data/Locations.xml.in
index d5f4051..29fd1e3 100644
--- a/data/Locations.xml.in
+++ b/data/Locations.xml.in
@@ -7402,7 +7402,7 @@
       <fips-code>FM</fips-code>
       <fips-code>US64</fips-code>
       <timezones>
-        <timezone id="Pacific/Ponape">
+        <timezone id="Pacific/Pohnpei">
           <!-- One of two time zones in the Federated States of
                Micronesia, including the islands of Pohnpei and Kosrae.
                The string is only used in places where "Micronesia" is
@@ -7410,14 +7410,16 @@
             -->
           <_name>Pohnpei / Kosrae</_name>
           <obsoletes>Pacific/Kosrae</obsoletes>
+          <obsoletes>Pacific/Ponape</obsoletes>
         </timezone>
-        <timezone id="Pacific/Truk">
+        <timezone id="Pacific/Chuuk">
           <!-- One of two time zones in the Federated States of
                Micronesia, including the islands of Yap and Chuuk. The
                string is only used in places where "Micronesia" is
                already clear from context.
             -->
           <_name>Yap / Chuuk</_name>
+          <obsoletes>Pacific/Truk</obsoletes>
         </timezone>
       </timezones>
       <city>
-- 
cgit v1.2.1