diff -pruN 3.0-15/debian/changelog 3.0-15ubuntu2/debian/changelog
--- 3.0-15/debian/changelog	2025-04-25 20:55:00.000000000 +0000
+++ 3.0-15ubuntu2/debian/changelog	2025-09-06 15:40:50.000000000 +0000
@@ -1,3 +1,23 @@
+zip (3.0-15ubuntu2) questing; urgency=medium
+
+  * Rebuild to include updated RISC-V base ISA RVA23
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Sat, 06 Sep 2025 15:40:50 +0000
+
+zip (3.0-15ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable (LP: #2110052).
+    Remaining changes:
+    - d/t: add some basic smoke test
+      Can be dropped when Debian bug 1104090 makes progress.
+    Dropped changes (upstreamed in Debian):
+    - d/p/13-buffer-overflow.patch: Fix buffer overflow when filename contains
+      unicode characters (LP 2062535)
+    - d/p/14-buffer-overflow.patch:
+      Fix buffer overflow when invoked with `-T -TT` (LP 2093024)
+
+ -- Florent 'Skia' Jacquet <florent.jacquet@canonical.com>  Tue, 06 May 2025 16:51:29 +0200
+
 zip (3.0-15) unstable; urgency=medium
 
   * Add debian/source/lintian-overrides for *.a files.
@@ -14,6 +34,21 @@ zip (3.0-15) unstable; urgency=medium
 
  -- Santiago Vila <sanvila@debian.org>  Fri, 25 Apr 2025 22:55:00 +0200
 
+zip (3.0-14ubuntu2) plucky; urgency=medium
+
+  * d/p/14-buffer-overflow.patch:
+    Fix buffer overflow when invoked with `-T -TT` (LP: #2093024)
+  * d/tests: Add a basic dep8 test for the two recent bugs fixed.
+
+ -- Florent 'Skia' Jacquet <florent.jacquet@canonical.com>  Fri, 17 Jan 2025 13:31:19 +0100
+
+zip (3.0-14ubuntu1) plucky; urgency=medium
+
+  * d/p/13-buffer-overflow.patch: Fix buffer overflow when filename contains
+    unicode characters (LP: #2062535)
+
+ -- Shengjing Zhu <shengjing.zhu@canonical.com>  Fri, 01 Nov 2024 00:25:05 +0800
+
 zip (3.0-14) unstable; urgency=medium
 
   * Use https in all Bug-Debian fields.
diff -pruN 3.0-15/debian/control 3.0-15ubuntu2/debian/control
--- 3.0-15/debian/control	2025-04-25 19:00:00.000000000 +0000
+++ 3.0-15ubuntu2/debian/control	2025-05-06 14:51:29.000000000 +0000
@@ -1,7 +1,8 @@
 Source: zip
 Section: utils
 Priority: optional
-Maintainer: Santiago Vila <sanvila@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Santiago Vila <sanvila@debian.org>
 Standards-Version: 4.7.2
 Build-Depends: debhelper-compat (= 13), libbz2-dev
 Homepage: https://infozip.sourceforge.net/Zip.html
diff -pruN 3.0-15/debian/tests/control 3.0-15ubuntu2/debian/tests/control
--- 3.0-15/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ 3.0-15ubuntu2/debian/tests/control	2025-05-06 14:51:29.000000000 +0000
@@ -0,0 +1 @@
+Tests: smoke
diff -pruN 3.0-15/debian/tests/smoke 3.0-15ubuntu2/debian/tests/smoke
--- 3.0-15/debian/tests/smoke	1970-01-01 00:00:00.000000000 +0000
+++ 3.0-15ubuntu2/debian/tests/smoke	2025-05-06 14:51:29.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/sh
+
+set -e
+
+cd /tmp
+touch Ünicøde
+zip unicode.zip Ünicøde
+
+touch other
+zip ls-verified.zip other -T -TT "ls"