diff -Nru tzdata-2024a/debian/changelog tzdata-2024a/debian/changelog
--- tzdata-2024a/debian/changelog	2024-04-19 19:51:58.000000000 +0000
+++ tzdata-2024a/debian/changelog	2024-05-03 11:27:11.000000000 +0000
@@ -1,3 +1,10 @@
+tzdata (2024a-3ubuntu1.1) noble; urgency=medium
+
+  * d/rules: Support creating symlinks pointing to symlinks
+  * Fixup for avoid timezones being symlinks to symlinks (LP: #2062522)
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Fri, 03 May 2024 13:27:11 +0200
+
 tzdata (2024a-3ubuntu1) noble; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff -Nru tzdata-2024a/debian/control tzdata-2024a/debian/control
--- tzdata-2024a/debian/control	2024-04-19 19:50:19.000000000 +0000
+++ tzdata-2024a/debian/control	2024-05-03 11:26:55.000000000 +0000
@@ -17,7 +17,7 @@
            Benjamin Drung <bdrung@debian.org>
 Standards-Version: 4.6.2
 Homepage: https://www.iana.org/time-zones
-Vcs-Git: https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/tzdata
+Vcs-Git: https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/tzdata -b ubuntu/noble
 Vcs-Browser: https://code.launchpad.net/~ubuntu-core-dev/ubuntu/+source/tzdata/+git/tzdata
 
 Package: tzdata
diff -Nru tzdata-2024a/debian/patches/Correct-timezone-symlinks-when-using-BACKWARD-backward-PA.patch tzdata-2024a/debian/patches/Correct-timezone-symlinks-when-using-BACKWARD-backward-PA.patch
--- tzdata-2024a/debian/patches/Correct-timezone-symlinks-when-using-BACKWARD-backward-PA.patch	2024-04-19 19:50:53.000000000 +0000
+++ tzdata-2024a/debian/patches/Correct-timezone-symlinks-when-using-BACKWARD-backward-PA.patch	2024-05-03 11:25:45.000000000 +0000
@@ -15,12 +15,12 @@
 
 Forwarded: https://mm.icann.org/pipermail/tz/2024-April/058853.html
 ---
- backward    | 6 +++---
+ backward    | 8 ++++----
  ziguard.awk | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/backward b/backward
-index 65c711b..08c95b1 100644
+index 65c711b..16a01e5 100644
 --- a/backward
 +++ b/backward
 @@ -30,7 +30,7 @@
@@ -50,6 +50,15 @@
  Link	Asia/Shanghai		PRC
  Link	Europe/Warsaw		Poland
  Link	Europe/Lisbon		Portugal
+@@ -298,7 +298,7 @@ Link	Africa/Nairobi		Africa/Asmera	#= Africa/Asmara
+ Link	America/Nuuk		America/Godthab
+ Link	Asia/Ashgabat		Asia/Ashkhabad
+ Link	Asia/Kolkata		Asia/Calcutta
+-Link	Asia/Shanghai		Asia/Chungking	#= Asia/Chongqing
++Link	Asia/Shanghai		Asia/Chungking
+ Link	Asia/Dhaka		Asia/Dacca
+ # Istanbul is in both continents.
+ Link	Europe/Istanbul		Asia/Istanbul
 diff --git a/ziguard.awk b/ziguard.awk
 index 7a3404f..f6b8d24 100644
 --- a/ziguard.awk
diff -Nru tzdata-2024a/debian/rules tzdata-2024a/debian/rules
--- tzdata-2024a/debian/rules	2024-04-19 19:50:19.000000000 +0000
+++ tzdata-2024a/debian/rules	2024-05-03 11:26:12.000000000 +0000
@@ -21,8 +21,10 @@
 
 	# Replace hardlinks by symlinks
 	grep '^L ' $(CURDIR)/tzdata.zi | while read L target name ; do \
-		ln -srf $(TZGEN)/$$target $(TZGEN)/$$name ; \
-		ln -srf $(TZGEN)/right/$$target $(TZGEN)/right/$$name ; \
+		absolute_name="$(TZGEN)/$$name"; \
+		relative_target=$$(realpath -m -s --relative-to="$${absolute_name%/*}" "$(TZGEN)/$$target"); \
+		ln -sf "$$relative_target" "$(TZGEN)/$$name" ; \
+		ln -sf "$$relative_target" "$(TZGEN)/right/$$name" ; \
 	done
 
 	# Generate a posixrules file