diff -Nru protobuf-3.21.12/debian/changelog protobuf-3.21.12/debian/changelog
--- protobuf-3.21.12/debian/changelog	2023-07-06 08:11:26.000000000 +0000
+++ protobuf-3.21.12/debian/changelog	2023-09-08 11:47:52.000000000 +0000
@@ -1,3 +1,17 @@
+protobuf (3.21.12-7ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't build elpa stuff on i386
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 08 Sep 2023 13:47:52 +0200
+
+protobuf (3.21.12-7) unstable; urgency=medium
+
+  [ Aurelien Jarno <aurelien@aurel32.net> ]
+  * Python: stop using backward compatibility timezones (closes: #1050937).
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Fri, 08 Sep 2023 02:21:34 +0000
+
 protobuf (3.21.12-6ubuntu1) mantic; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff -Nru protobuf-3.21.12/debian/patches/series protobuf-3.21.12/debian/patches/series
--- protobuf-3.21.12/debian/patches/series	2023-06-29 19:47:51.000000000 +0000
+++ protobuf-3.21.12/debian/patches/series	2023-09-08 02:21:34.000000000 +0000
@@ -17,3 +17,4 @@
 fix_C++_32bit_tests.patch
 fix_Python_32bit_tests.patch
 test_scope_for_junit.patch
+stop_using_backward_compatibility_timezones.patch
diff -Nru protobuf-3.21.12/debian/patches/stop_using_backward_compatibility_timezones.patch protobuf-3.21.12/debian/patches/stop_using_backward_compatibility_timezones.patch
--- protobuf-3.21.12/debian/patches/stop_using_backward_compatibility_timezones.patch	1970-01-01 00:00:00.000000000 +0000
+++ protobuf-3.21.12/debian/patches/stop_using_backward_compatibility_timezones.patch	2023-09-08 02:21:34.000000000 +0000
@@ -0,0 +1,36 @@
+From 6c06a790c4bc4fa8218a072621c4f62166aba4f8 Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Wed, 6 Sep 2023 22:18:32 +0200
+Subject: [PATCH] Python: stop using backward compatibility timezones
+
+The 'Japan' and 'US/Pacific' timezones used in Python tests are
+backward compatibility timezones (defined in the backward file of
+tzdata) and might not be available on all systems. For instance Debian
+recently split those timezones in a tzdata-legacy package.
+
+Update the tests to the use the canonical name of the timezones instead,
+that is respectively 'Asia/Tokyo' and 'America/Los_Angeles'.
+---
+ python/google/protobuf/internal/well_known_types_test.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/python/google/protobuf/internal/well_known_types_test.py b/python/google/protobuf/internal/well_known_types_test.py
+index 636dae64130..593ec6bfe16 100644
+--- a/python/google/protobuf/internal/well_known_types_test.py
++++ b/python/google/protobuf/internal/well_known_types_test.py
+@@ -53,11 +53,11 @@
+ try:
+   # New module in Python 3.9:
+   import zoneinfo  # pylint:disable=g-import-not-at-top
+-  _TZ_JAPAN = zoneinfo.ZoneInfo('Japan')
+-  _TZ_PACIFIC = zoneinfo.ZoneInfo('US/Pacific')
++  _TZ_JAPAN = zoneinfo.ZoneInfo('Asia/Tokyo')
++  _TZ_PACIFIC = zoneinfo.ZoneInfo('America/Los_Angeles')
+ except ImportError:
+-  _TZ_JAPAN = datetime.timezone(datetime.timedelta(hours=9), 'Japan')
+-  _TZ_PACIFIC = datetime.timezone(datetime.timedelta(hours=-8), 'US/Pacific')
++  _TZ_JAPAN = datetime.timezone(datetime.timedelta(hours=9), 'Asia/Tokyo')
++  _TZ_PACIFIC = datetime.timezone(datetime.timedelta(hours=-8), 'America/Los_Angeles')
+ 
+ 
+ class TimeUtilTestBase(_parameterized.TestCase):