diff -pruN 3.0.1-3/debian/changelog 3.0.1-3ubuntu1/debian/changelog
--- 3.0.1-3/debian/changelog	2025-05-18 10:45:00.000000000 +0000
+++ 3.0.1-3ubuntu1/debian/changelog	2025-07-29 07:20:11.000000000 +0000
@@ -1,3 +1,11 @@
+python-djangorestframework-yaml (3.0.1-3ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+  * d/p/django5-fix-timezone-import.patch: Use datetime utc timezone instead of
+    django.utils.timezone
+
+ -- Bryan Alexander <bryan.alexander@canonical.com>  Tue, 29 Jul 2025 00:20:11 -0700
+
 python-djangorestframework-yaml (3.0.1-3) unstable; urgency=medium
 
   * Team Upload
@@ -6,6 +14,13 @@ python-djangorestframework-yaml (3.0.1-3
 
  -- Alexandre Detiste <tchet@debian.org>  Sun, 18 May 2025 12:45:00 +0200
 
+python-djangorestframework-yaml (3.0.1-2ubuntu1) plucky; urgency=medium
+
+  * d/p/django5-fix-timezone-import.patch: Use datetime utc timezone instead of
+    django.utils.timezone
+
+ -- Lena Voytek <lena.voytek@canonical.com>  Fri, 20 Dec 2024 16:12:13 -0500
+
 python-djangorestframework-yaml (3.0.1-2) unstable; urgency=medium
 
   * Source-only upload
diff -pruN 3.0.1-3/debian/control 3.0.1-3ubuntu1/debian/control
--- 3.0.1-3/debian/control	2025-05-17 12:13:07.000000000 +0000
+++ 3.0.1-3ubuntu1/debian/control	2025-07-29 07:20:11.000000000 +0000
@@ -1,7 +1,8 @@
 Source: python-djangorestframework-yaml
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <team+python@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Team <team+python@tracker.debian.org>
 Uploaders:
  Jérémy Lal <kapouer@melix.org>,
 Rules-Requires-Root: no
diff -pruN 3.0.1-3/debian/patches/django5-fix-timezone-import.patch 3.0.1-3ubuntu1/debian/patches/django5-fix-timezone-import.patch
--- 3.0.1-3/debian/patches/django5-fix-timezone-import.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-3ubuntu1/debian/patches/django5-fix-timezone-import.patch	2025-07-29 07:20:11.000000000 +0000
@@ -0,0 +1,27 @@
+Description: Use datetime utc timezone instead of django.utils.timezone's
+Author: Lena Voytek <lena.voytek@canonical.com>
+Last-Update: 2024-12-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/_test_dumper.py
++++ b/tests/_test_dumper.py
+@@ -7,7 +7,7 @@
+ import yaml
+ from django.test import TestCase
+ from django.utils.safestring import SafeString
+-from django.utils.timezone import utc
++from datetime import timezone
+ from rest_framework.exceptions import ErrorDetail
+ from rest_framework.relations import Hyperlink
+ from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList
+@@ -84,8 +84,8 @@
+         _yaml_repr = "timedelta: 97440.0\n"
+ 
+         obj = {
+-            "timedelta": datetime(1, 1, 2, 3, 4, tzinfo=utc)
+-            - datetime(1, 1, 1, tzinfo=utc),
++            "timedelta": datetime(1, 1, 2, 3, 4, tzinfo=timezone.utc)
++            - datetime(1, 1, 1, tzinfo=timezone.utc),
+         }
+ 
+         yaml_repr = yaml.dump(
diff -pruN 3.0.1-3/debian/patches/series 3.0.1-3ubuntu1/debian/patches/series
--- 3.0.1-3/debian/patches/series	2025-05-17 12:28:45.000000000 +0000
+++ 3.0.1-3ubuntu1/debian/patches/series	2025-07-29 07:20:11.000000000 +0000
@@ -1,3 +1,4 @@
 privacy-breach.patch
 rename.patch
 remove_undeclared_dependency_on_toml.patch
+django5-fix-timezone-import.patch