diff -pruN 1.2.2-2/debian/changelog 1.2.2-2ubuntu1/debian/changelog
--- 1.2.2-2/debian/changelog	2025-10-28 12:03:28.000000000 +0000
+++ 1.2.2-2ubuntu1/debian/changelog	2025-10-31 08:13:50.000000000 +0000
@@ -1,3 +1,10 @@
+libqrtr-glib (1.2.2-2ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (lp: #2130172). Remaining changes:
+    - debian/tests: include a basic autopkgtest for the library
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 31 Oct 2025 09:13:50 +0100
+
 libqrtr-glib (1.2.2-2) unstable; urgency=medium
 
   * d/gbp.conf: switch Debian branch to debian/latest.
@@ -21,6 +28,30 @@ libqrtr-glib (1.2.2-2) unstable; urgency
 
  -- Arnaud Ferraris <aferraris@debian.org>  Tue, 28 Oct 2025 13:03:28 +0100
 
+libqrtr-glib (1.2.2-1ubuntu4) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 02:12:10 +0000
+
+libqrtr-glib (1.2.2-1ubuntu3) noble; urgency=medium
+
+  * No-change rebuild against libglib2.0-0t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 08 Mar 2024 05:28:26 +0000
+
+libqrtr-glib (1.2.2-1ubuntu2) noble; urgency=medium
+
+  * No change upload to restore the i386 build
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 09 Jan 2024 16:43:05 +0100
+
+libqrtr-glib (1.2.2-1ubuntu1) kinetic; urgency=medium
+
+  * debian/tests: include a basic autopkgtest for the library
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 20 May 2022 17:10:31 +0200
+
 libqrtr-glib (1.2.2-1) unstable; urgency=medium
 
   * New upstream version 1.2.2
diff -pruN 1.2.2-2/debian/control 1.2.2-2ubuntu1/debian/control
--- 1.2.2-2/debian/control	2025-10-28 12:03:28.000000000 +0000
+++ 1.2.2-2ubuntu1/debian/control	2025-10-31 08:13:50.000000000 +0000
@@ -1,6 +1,7 @@
 Source: libqrtr-glib
 Priority: optional
-Maintainer: DebianOnMobile Maintainers <debian-on-mobile-maintainers@alioth-lists.debian.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: DebianOnMobile Maintainers <debian-on-mobile-maintainers@alioth-lists.debian.net>
 Uploaders: Arnaud Ferraris <aferraris@debian.org>,
            Guido Günther <agx@sigxcpu.org>,
            Henry-Nicolas Tourneur <debian@nilux.be>,
diff -pruN 1.2.2-2/debian/tests/build 1.2.2-2ubuntu1/debian/tests/build
--- 1.2.2-2/debian/tests/build	1970-01-01 00:00:00.000000000 +0000
+++ 1.2.2-2ubuntu1/debian/tests/build	2025-10-31 08:13:50.000000000 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+# autopkgtest check: Build and run a program against libqrtr-glib, to verify that
+# the headers and pkg-config file are installed correctly
+
+set -e
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
+cat <<EOF > libqrtr-glib_test.c
+#include <stdio.h>
+#include <libqrtr-glib/qrtr-version.h>
+
+int main(void)
+{
+  printf("The micro version is %d\n", QRTR_MICRO_VERSION);
+  return 0;
+}
+EOF
+
+# deliberately word-splitting pkg-config output:
+# shellcheck disable=SC2046
+"${CROSS_COMPILE}gcc" -o libqrtr-glib_test libqrtr-glib_test.c \
+$("${CROSS_COMPILE}pkg-config" --cflags --libs qrtr-glib)
+echo "build: OK"
+[ -x libqrtr-glib_test ]
+./libqrtr-glib_test
+echo "run: OK"
diff -pruN 1.2.2-2/debian/tests/control 1.2.2-2ubuntu1/debian/tests/control
--- 1.2.2-2/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ 1.2.2-2ubuntu1/debian/tests/control	2025-10-31 08:13:50.000000000 +0000
@@ -0,0 +1,3 @@
+Tests: build
+Depends: build-essential, pkg-config, libqrtr-glib-dev
+Restrictions: allow-stderr superficial