diff -pruN 3.10.2-1/debian/changelog 3.10.2-1ubuntu2/debian/changelog
--- 3.10.2-1/debian/changelog	2025-04-23 08:42:50.000000000 +0000
+++ 3.10.2-1ubuntu2/debian/changelog	2025-09-19 13:14:55.000000000 +0000
@@ -1,3 +1,20 @@
+postfix (3.10.2-1ubuntu2) questing; urgency=medium
+
+  * d/rules: set CFLAGS std=gnu17 to fix build errors on gcc15 (LP: #2125198)
+
+ -- Jonas Jelten <jonas.jelten@canonical.com>  Fri, 19 Sep 2025 15:14:55 +0200
+
+postfix (3.10.2-1ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable (LP: #2110451). Remaining changes:
+  * Dropped:
+    - d/rules: ship /var/spool/postfix/dev (#1094571)
+      [In 3.10.1-1]
+  * Added changes:
+    - d/rules, d/control: disable TLSRPT, since libtlsrpt is in Universe
+
+ -- Andreas Hasenack <andreas@canonical.com>  Tue, 10 Jun 2025 18:30:53 -0300
+
 postfix (3.10.2-1) unstable; urgency=medium
 
   [ Michael Tokarev ]
@@ -27,6 +44,12 @@ postfix (3.10.1-1) unstable; urgency=med
 
  -- Michael Tokarev <mjt@tls.msk.ru>  Sun, 02 Mar 2025 11:20:24 +0300
 
+postfix (3.9.1-10ubuntu1) plucky; urgency=medium
+
+  * d/rules: ship /var/spool/postfix/dev (#1094571)
+
+ -- Andreas Hasenack <andreas@canonical.com>  Fri, 31 Jan 2025 09:36:36 -0300
+
 postfix (3.9.1-10) unstable; urgency=medium
 
   * main.cf.tls: use smtp_tls_CAfile, not smtp_tls_CApath;
diff -pruN 3.10.2-1/debian/control 3.10.2-1ubuntu2/debian/control
--- 3.10.2-1/debian/control	2025-03-02 08:13:26.000000000 +0000
+++ 3.10.2-1ubuntu2/debian/control	2025-09-19 13:14:55.000000000 +0000
@@ -1,7 +1,8 @@
 Source: postfix
 Section: mail
 Priority: optional
-Maintainer: Debian Postfix Team <team+postfix@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Postfix Team <team+postfix@tracker.debian.org>
 Uploaders: LaMont Jones <lamont@debian.org>,
            Michael Tokarev <mjt@tls.msk.ru>,
            Scott Kitterman <scott@kitterman.com>
@@ -22,7 +23,6 @@ Build-Depends: debhelper-compat (= 13),
                libnsl-dev | libc6-dev (<<2.37-15.1),
                libpcre2-dev,
                libpq-dev,
-               libtlsrpt0-dev,
                libsasl2-dev,
                libsqlite3-dev,
                libssl-dev,
diff -pruN 3.10.2-1/debian/rules 3.10.2-1ubuntu2/debian/rules
--- 3.10.2-1/debian/rules	2025-03-02 08:12:22.000000000 +0000
+++ 3.10.2-1ubuntu2/debian/rules	2025-09-19 13:14:55.000000000 +0000
@@ -8,6 +8,7 @@
 export SHELL = /bin/sh -e
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto future=+lfs
+export DEB_CFLAGS_MAINT_APPEND = -std=gnu17
 # Extra hardening flags (level 3):
 # https://developers.redhat.com/articles/2022/09/17/gccs-new-fortification-level
 # https://fedoraproject.org/wiki/Changes/Add_FORTIFY_SOURCE%3D3_to_distribution_build_flags
@@ -86,9 +87,6 @@ CCARGS += -DHAS_MONGODB \
 CONFARGS += AUXLIBS_MONGODB="-lmongoc-1.0 -lbson-1.0"
 endif
 
-CCARGS += -DUSE_TLSRPT
-AUXLIBS += -ltlsrpt
-
 %:
 	dh $@