diff -pruN 3.10-2/debian/changelog 3.10-2ubuntu1/debian/changelog
--- 3.10-2/debian/changelog	2024-04-29 12:07:21.000000000 +0000
+++ 3.10-2ubuntu1/debian/changelog	2024-12-20 19:08:38.000000000 +0000
@@ -1,3 +1,11 @@
+nsis (3.10-2ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2092306). Remaining changes:
+    - d/rules: strip off ubuntuX, buildX from package version before feeding it
+      to scons as VERSION.
+
+ -- Mateus Rodrigues de Morais <mateus.morais@canonical.com>  Fri, 20 Dec 2024 16:08:38 -0300
+
 nsis (3.10-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.7.0 (no changes needed)
@@ -16,6 +24,19 @@ nsis (3.10-1) unstable; urgency=medium
 
  -- Thomas Gaugler <thomas@dadie.net>  Tue, 09 Apr 2024 08:19:12 +0200
 
+nsis (3.09-4ubuntu1) noble; urgency=medium
+
+  * d/rules: strip off ubuntuX, buildX from package version before feeding it
+    to scons as VERSION.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 11 Apr 2024 14:22:37 +1200
+
+nsis (3.09-4build1) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- William Grant <wgrant@ubuntu.com>  Mon, 01 Apr 2024 18:02:28 +1100
+
 nsis (3.09-4) unstable; urgency=medium
 
   * Use -rcfile instead of -style command line option for html2text
diff -pruN 3.10-2/debian/control 3.10-2ubuntu1/debian/control
--- 3.10-2/debian/control	2024-04-29 12:07:21.000000000 +0000
+++ 3.10-2ubuntu1/debian/control	2024-12-20 19:08:38.000000000 +0000
@@ -1,5 +1,6 @@
 Source: nsis
-Maintainer: Thomas Gaugler <thomas@dadie.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Thomas Gaugler <thomas@dadie.net>
 Section: devel
 Priority: optional
 Build-Depends: binutils-mingw-w64 (>= 2.42-3),
diff -pruN 3.10-2/debian/rules 3.10-2ubuntu1/debian/rules
--- 3.10-2/debian/rules	2024-04-29 12:07:21.000000000 +0000
+++ 3.10-2ubuntu1/debian/rules	2024-12-20 19:08:38.000000000 +0000
@@ -11,7 +11,8 @@ export DH_ALWAYS_EXCLUDE=.svn
 # Enable hardening
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-VERSION=$(DEB_VERSION)
+VERSION=$(shell echo $(DEB_VERSION) | sed -Ee s/\(build\|ubuntu\)[0-9]+//)
+
 PREFIX=/usr
 DATADIR=$(PREFIX)/share/nsis
 DOCDIR=$(PREFIX)/share/doc/nsis