From fcda2aba7b4fa5cfcf45ae1b02dbfc4876c17b96 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 13 Apr 2024 15:54:48 +0200
Subject: Merging debian version 2024a-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/tzdata.config | 49 +++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

(limited to 'debian/tzdata.config')

diff --git a/debian/tzdata.config b/debian/tzdata.config
index 494e725..31b31eb 100644
--- a/debian/tzdata.config
+++ b/debian/tzdata.config
@@ -23,13 +23,16 @@ convert_timezone()
 		"America/Cordoba" | "America/Rosario")
 			echo "America/Argentina/Cordoba"
 			;;
-		"America/Fort_Wayne" | "America/Indianapolis" | "EST" | "SystemV/EST5" | "US/East-Indiana" | "US/Indiana-Starke")
+		"America/Fort_Wayne" | "America/Indianapolis" | "SystemV/EST5" | "US/East-Indiana")
 			echo "America/Indiana/Indianapolis"
 			;;
+		"America/Godthab")
+			echo "America/Nuuk"
+			;;
 		"America/Jujuy")
 			echo "America/Argentina/Jujuy"
 			;;
-		"America/Knox_IN")
+		"America/Knox_IN" | "US/Indiana-Starke")
 			echo "America/Indiana/Knox"
 			;;
 		"America/Louisville")
@@ -140,33 +143,21 @@ convert_timezone()
 		"Canada/Yukon")
 			echo "America/Whitehorse"
 			;;
-		"CET" | "MET")
-			echo "Europe/Paris"
-			;;
 		"Chile/Continental")
 			echo "America/Santiago"
 			;;
 		"Chile/EasterIsland")
 			echo "Pacific/Easter"
 			;;
-		"CST6CDT" | "SystemV/CST6CDT" | "US/Central")
-			echo "America/Chicago"
-			;;
 		"Cuba")
 			echo "America/Havana"
 			;;
-		"EET")
-			echo "Europe/Helsinki"
-			;;
 		"Egypt")
 			echo "Africa/Cairo"
 			;;
 		"Eire")
 			echo "Europe/Dublin"
 			;;
-		"EST5EDT" | "SystemV/EST5EDT" | "US/Eastern")
-			echo "America/New_York"
-			;;
 		"Europe/Kiev")
 			echo "Europe/Kyiv"
 			;;
@@ -197,9 +188,6 @@ convert_timezone()
 		"Hongkong")
 			echo "Asia/Hong_Kong"
 			;;
-		"HST" | "SystemV/HST10" | "US/Hawaii")
-			echo "Pacific/Honolulu"
-			;;
 		"Iceland")
 			echo "Atlantic/Reykjavik"
 			;;
@@ -230,10 +218,7 @@ convert_timezone()
 		"Mexico/General")
 			echo "America/Mexico_City"
 			;;
-		"MST" | "SystemV/MST7" | "US/Arizona")
-			echo "America/Phoenix"
-			;;
-		"MST7MDT" | "Navajo" | "SystemV/MST7MDT" | "US/Mountain")
+		"Navajo" | "SystemV/MST7MDT" | "US/Mountain")
 			echo "America/Denver"
 			;;
 		"NZ")
@@ -254,15 +239,12 @@ convert_timezone()
 		"Poland")
 			echo "Europe/Warsaw"
 			;;
-		"Portugal" | "WET")
+		"Portugal")
 			echo "Europe/Lisbon"
 			;;
 		"PRC")
 			echo "Asia/Shanghai"
 			;;
-		"PST8PDT" | "SystemV/PST8PDT" | "US/Pacific")
-			echo "America/Los_Angeles"
-			;;
 		"ROC")
 			echo "Asia/Taipei"
 			;;
@@ -275,9 +257,24 @@ convert_timezone()
 		"SystemV/AST4")
 			echo "America/Puerto_Rico"
 			;;
+		"SystemV/CST6CDT" | "US/Central")
+			echo "America/Chicago"
+			;;
+		"SystemV/EST5EDT" | "US/Eastern")
+			echo "America/New_York"
+			;;
+		"SystemV/HST10" | "US/Hawaii")
+			echo "Pacific/Honolulu"
+			;;
+		"SystemV/MST7" | "US/Arizona")
+			echo "America/Phoenix"
+			;;
 		"SystemV/PST8")
 			echo "Pacific/Pitcairn"
 			;;
+		"SystemV/PST8PDT" | "US/Pacific")
+			echo "America/Los_Angeles"
+			;;
 		"SystemV/YST9")
 			echo "Pacific/Gambier"
 			;;
@@ -381,7 +378,7 @@ while [ "$STATE" -ge 0 ]; do
 	2)
 		# Ask the user of the Zone
 		db_get tzdata/Areas || RET=Etc
-		db_input high tzdata/Zones/$RET || true
+		db_input high "tzdata/Zones/$RET" || true
 		;;
 	*)
 		break
-- 
cgit v1.2.3