diff -pruN 96/debian/changelog 96ubuntu1/debian/changelog
--- 96/debian/changelog	2024-12-04 15:44:19.000000000 +0000
+++ 96ubuntu1/debian/changelog	2025-01-21 00:24:59.000000000 +0000
@@ -1,3 +1,17 @@
+php-defaults (96ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2085266). Remaining changes:
+    - Adjust Breaks to account for Ubuntu-side fixes.
+      + Ubuntu enabled php8.1 support in an earlier version of php-facedetect
+        than Debian. Hence, we adjust Breaks to that earlier version for now
+  * Dropped changes:
+    - d/rules: bump the default and supported version to PHP 8.3.
+      [ We now follow Debian for php8.4 ]
+    - d/{control,*.links}: regenerate for php8.3.
+      [ We now follow Debian for php8.4 ]
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Mon, 20 Jan 2025 21:24:59 -0300
+
 php-defaults (96) unstable; urgency=medium
 
   * Update the Conflicts with old extensions for PHP 8.4
@@ -46,12 +60,45 @@ php-defaults (93+nmu1) unstable; urgency
 
  -- Chris Hofstaedtler <zeha@debian.org>  Thu, 30 May 2024 02:53:37 +0200
 
+php-defaults (93ubuntu2) noble; urgency=medium
+
+  * d/rules: bump the default and supported version to PHP 8.3.
+  * d/{control,*.links}: regenerate for php8.3.
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Thu, 18 Jan 2024 22:53:18 -0300
+
+php-defaults (93ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2018100). Remaining changes:
+    - Adjust Breaks to account for Ubuntu-side fixes.
+      + Ubuntu enabled php8.1 support in an earlier version of php-facedetect
+        than Debian. Hence, we adjust Breaks to that earlier version for now
+  * Dropped changes:
+    - Bogus source package re-injection
+      [ This was a leftover from a previous package merge ]
+    - Adjust Breaks to account for Ubuntu-side fixes.
+      + Ubuntu enabled php8.1 support in earlier versions of php-libvirt-php,
+        php-tideways, and php-xmlrpc than Debian. Hence, we adjust Breaks to
+        those earlier versions for now
+      [ mantic has greater versions than the Debian Breaks targets ]
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Thu, 18 May 2023 16:41:14 -0300
+
 php-defaults (93) unstable; urgency=medium
 
   * Bump the default and supported version to PHP 8.2
 
  -- Ondřej Surý <ondrej@debian.org>  Wed, 13 Jul 2022 10:19:37 +0200
 
+php-defaults (92ubuntu1) jammy; urgency=medium
+
+  * Adjust Breaks to account for Ubuntu-side fixes.
+    - Ubuntu enabled php8.1 support in earlier versions of php-facedetect,
+      php-libvirt-php, php-tideways, and php-xmlrpc than Debian so can
+      adjust Breaks to those earlier versions for now.
+
+ -- Bryce Harrington <bryce@canonical.com>  Fri, 28 Jan 2022 01:45:15 +0000
+
 php-defaults (92) unstable; urgency=medium
 
   * Update the list of the broken PECL modules with the PHP 8.1 upgrade
diff -pruN 96/debian/control 96ubuntu1/debian/control
--- 96/debian/control	2024-12-04 15:44:19.000000000 +0000
+++ 96ubuntu1/debian/control	2025-01-21 00:24:59.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-defaults
 Section: php
 Priority: optional
-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
 Uploaders: Ondřej Surý <ondrej@debian.org>,
            Lior Kaplan <kaplan@debian.org>
 Standards-Version: 4.5.0.2
@@ -134,6 +135,7 @@ Breaks: php-amqp (<< 2.1.2-5~),
         php-apcu (<< 5.1.24-1~),
         php-ast (<< 1.1.2-3~),
         php-ds (<< 1.5.0-5~),
+        php-facedetect (<< 1.1.0-19-g135c72a-2build3~),
         php-excimer (<< 1.2.3-1~),
         php-gearman (<< 2.1.2-4~),
         php-gmagick (<< 2.0.6~rc1++-5~),
diff -pruN 96/debian/control.in 96ubuntu1/debian/control.in
--- 96/debian/control.in	2024-12-04 15:44:19.000000000 +0000
+++ 96ubuntu1/debian/control.in	2025-01-21 00:24:59.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-defaults
 Section: php
 Priority: optional
-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
 Uploaders: Ondřej Surý <ondrej@debian.org>,
            Lior Kaplan <kaplan@debian.org>
 Standards-Version: 4.5.0.2