diff -pruN 1.6.10-12/debian/changelog 1.6.10-12ubuntu3/debian/changelog
--- 1.6.10-12/debian/changelog	2021-02-28 10:43:50.000000000 +0000
+++ 1.6.10-12ubuntu3/debian/changelog	2022-03-16 15:30:36.000000000 +0000
@@ -1,3 +1,23 @@
+schroot (1.6.10-12ubuntu3) jammy; urgency=medium
+
+  * Don't create a logind session (closes: #898949, LP: #1964615).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 16 Mar 2022 15:30:36 +0000
+
+schroot (1.6.10-12ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Oct 2021 12:24:07 +0200
+
+schroot (1.6.10-12ubuntu1) impish; urgency=medium
+
+  * Merge from Debian unstable
+    - Remaining changes:
+      * schroot: util: Fix infinite allocation on error in name queries.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 18 May 2021 10:23:55 +0200
+
 schroot (1.6.10-12) unstable; urgency=medium
 
   * QA upload.
@@ -6,6 +26,19 @@ schroot (1.6.10-12) unstable; urgency=me
 
  -- Michael Tokarev <mjt@tls.msk.ru>  Sun, 28 Feb 2021 13:43:50 +0300
 
+schroot (1.6.10-11ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild for boost soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 12 Dec 2020 13:11:44 +0100
+
+schroot (1.6.10-11ubuntu1) groovy; urgency=medium
+
+  * schroot: util: Fix infinite allocation on error in name queries.
+    LP: #1899414.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 12 Oct 2020 14:19:36 +0200
+
 schroot (1.6.10-11) unstable; urgency=medium
 
   * QA upload.
diff -pruN 1.6.10-12/debian/control 1.6.10-12ubuntu3/debian/control
--- 1.6.10-12/debian/control	2021-02-28 10:08:35.000000000 +0000
+++ 1.6.10-12ubuntu3/debian/control	2021-05-18 08:23:55.000000000 +0000
@@ -1,7 +1,8 @@
 Source: schroot
 Section: admin
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends:
  cmake (>= 2.8.12),
  debhelper (>= 9.20160709),
diff -pruN 1.6.10-12/debian/patches/83bc6d3f99b1aa04a4864faeeb867ed09bae8e55.diff 1.6.10-12ubuntu3/debian/patches/83bc6d3f99b1aa04a4864faeeb867ed09bae8e55.diff
--- 1.6.10-12/debian/patches/83bc6d3f99b1aa04a4864faeeb867ed09bae8e55.diff	1970-01-01 00:00:00.000000000 +0000
+++ 1.6.10-12ubuntu3/debian/patches/83bc6d3f99b1aa04a4864faeeb867ed09bae8e55.diff	2021-05-18 08:23:55.000000000 +0000
@@ -0,0 +1,40 @@
+diff --git a/sbuild/sbuild-util.cc b/sbuild/sbuild-util.cc
+index 11bfa388a1d64404da70639cf92ebfd2539c2153..c7292f9573f868f61c1196918647b55522db32bf 100644
+--- a/sbuild/sbuild-util.cc
++++ b/sbuild/sbuild-util.cc
+@@ -632,7 +632,7 @@ sbuild::passwd::query_uid (uid_t uid)
+ 
+   while ((error = getpwuid_r(uid, this,
+                              &buffer[0], buffer.capacity(),
+-                             &pwd_result)))
++                             &pwd_result)) == ERANGE)
+     {
+       size <<= 1;
+       buffer.reserve(size);
+@@ -655,7 +655,7 @@ sbuild::passwd::query_name (const char *name)
+ 
+   while ((error = getpwnam_r(name, this,
+                              &buffer[0], buffer.capacity(),
+-                             &pwd_result)))
++                             &pwd_result)) == ERANGE)
+     {
+       size <<= 1;
+       buffer.reserve(size);
+@@ -741,7 +741,7 @@ sbuild::group::query_gid (gid_t gid)
+ 
+   while ((error = getgrgid_r(gid, this,
+                              &buffer[0], buffer.capacity(),
+-                             &grp_result)))
++                             &grp_result)) == ERANGE)
+     {
+       size <<= 1;
+       buffer.reserve(size);
+@@ -764,7 +764,7 @@ sbuild::group::query_name (const char *name)
+ 
+   while ((error = getgrnam_r(name, this,
+                              &buffer[0], buffer.capacity(),
+-                             &grp_result)))
++                             &grp_result)) == ERANGE)
+     {
+       size <<= 1;
+       buffer.reserve(size);
diff -pruN 1.6.10-12/debian/patches/common-session-noninteractive.patch 1.6.10-12ubuntu3/debian/patches/common-session-noninteractive.patch
--- 1.6.10-12/debian/patches/common-session-noninteractive.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.6.10-12ubuntu3/debian/patches/common-session-noninteractive.patch	2022-03-16 15:30:05.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Don't create a logind session
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Debian: https://bugs.debian.org/898949
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1964615
+
+Index: b/etc/pam/schroot
+===================================================================
+--- a/etc/pam/schroot
++++ b/etc/pam/schroot
+@@ -28,7 +28,7 @@
+ # /etc/shadow entries.
+ @include common-auth
+ @include common-account
+-@include common-session
++@include common-session-noninteractive
+ 
+ # Sets up user limits, please uncomment and read /etc/security/limits.conf
+ # to enable this functionality.
diff -pruN 1.6.10-12/debian/patches/series 1.6.10-12ubuntu3/debian/patches/series
--- 1.6.10-12/debian/patches/series	2021-02-28 10:36:50.000000000 +0000
+++ 1.6.10-12ubuntu3/debian/patches/series	2022-03-16 15:30:13.000000000 +0000
@@ -16,4 +16,6 @@ update_german_schroot_manpage_translatio
 zfs-snapshot-support.patch
 cross.patch
 reproducible-build.patch
+83bc6d3f99b1aa04a4864faeeb867ed09bae8e55.diff
 binfmt-parent-dir.patch
+common-session-noninteractive.patch