diff -Nru notmuch-0.22.2/debian/changelog notmuch-0.22.2/debian/changelog
--- notmuch-0.22.2/debian/changelog	2016-09-09 00:09:53.000000000 +0200
+++ notmuch-0.22.2/debian/changelog	2016-09-17 09:28:49.000000000 +0200
@@ -1,3 +1,13 @@
+notmuch (0.22.2-1ubuntu1) yakkety; urgency=low
+
+  * Merge from Debian unstable (LP: #1624637).  Remaining changes:
+    - debian/rules:
+      + Call dh_auto_test with TERM=vt100, as the
+        testsuite fails fairly spectacularly with TERM=unknown.
+    - try to drop armhf testsuite ignore.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 17 Sep 2016 09:28:16 +0200
+
 notmuch (0.22.2-1) unstable; urgency=medium
 
   * Fix test suite compatibility with GnuPG 2.1.15.  Bug fix: "FTBFS:
@@ -5,6 +15,22 @@
 
  -- David Bremner <bremner@debian.org>  Thu, 08 Sep 2016 19:09:53 -0300
 
+notmuch (0.22.1-3ubuntu2) yakkety; urgency=medium
+
+  * Ignore testsuite on armhf, seems a bug in gdb
+    (according to Debian maintainer)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 31 Aug 2016 17:21:08 +0200
+
+notmuch (0.22.1-3ubuntu1) yakkety; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/rules:
+      + Call dh_auto_test with TERM=vt100, as the
+        testsuite fails fairly spectacularly with TERM=unknown.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 31 Aug 2016 15:55:55 +0200
+
 notmuch (0.22.1-3) unstable; urgency=medium
 
   * Gag gdb even more. Bug fix: "FTBFS in testing", thanks to Santiago
@@ -12,6 +38,15 @@
 
  -- David Bremner <bremner@debian.org>  Sun, 14 Aug 2016 13:31:13 +0900
 
+notmuch (0.22.1-2ubuntu1) yakkety; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/rules:
+      + Call dh_auto_test with TERM=vt100, as the
+        testsuite fails fairly spectacularly with TERM=unknown.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 11 Aug 2016 15:44:48 +0200
+
 notmuch (0.22.1-2) unstable; urgency=medium
 
   * Add explicit build-depends on gnupg, for the test suite.
@@ -54,6 +89,21 @@
 
  -- David Bremner <bremner@debian.org>  Sat, 16 Apr 2016 08:45:32 -0300
 
+notmuch (0.21-3ubuntu2) xenial; urgency=medium
+
+  * No-change rebuild for ruby2.3-only support.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 13 Mar 2016 21:15:07 +0000
+
+notmuch (0.21-3ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules:
+      + Call dh_auto_test with TERM=vt100, as the
+        testsuite fails fairly spectacularly with TERM=unknown.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Fri, 01 Jan 2016 21:15:00 +0100
+
 notmuch (0.21-3) unstable; urgency=medium
 
   * Add mips and mips64el to gdb build-dep blacklist
@@ -118,6 +168,25 @@
 
  -- David Bremner <bremner@debian.org>  Sat, 26 Sep 2015 09:26:41 -0300
 
+notmuch (0.20.2-1ubuntu2) wily; urgency=medium
+
+  * No-change rebuild to add ruby2.2 support.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 08 Sep 2015 14:50:14 +0000
+
+notmuch (0.20.2-1ubuntu1) wily; urgency=medium
+
+  * debian/rules: Call dh_auto_test with TERM=vt100, as the
+    testsuite fails fairly spectacularly with TERM=unknown.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 10 Aug 2015 16:36:58 -0600
+
+notmuch (0.20.2-1build1) wily; urgency=medium
+
+  * No-change rebuild against libxapian22v5.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 06 Aug 2015 09:10:10 +0200
+
 notmuch (0.20.2-1) unstable; urgency=medium
 
   * Bug fix: "notmuch-tree does not mark messages as read", thanks to
diff -Nru notmuch-0.22.2/debian/control notmuch-0.22.2/debian/control
--- notmuch-0.22.2/debian/control	2016-09-09 00:09:53.000000000 +0200
+++ notmuch-0.22.2/debian/control	2016-09-09 07:13:26.000000000 +0200
@@ -1,7 +1,8 @@
 Source: notmuch
 Section: mail
 Priority: optional
-Maintainer: Carl Worth <cworth@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Carl Worth <cworth@debian.org>
 Uploaders:
  Jameson Graef Rollins <jrollins@finestructure.net>,
  David Bremner <bremner@debian.org>
diff -Nru notmuch-0.22.2/debian/rules notmuch-0.22.2/debian/rules
--- notmuch-0.22.2/debian/rules	2016-09-09 00:09:53.000000000 +0200
+++ notmuch-0.22.2/debian/rules	2016-09-17 09:40:17.000000000 +0200
@@ -36,3 +36,10 @@
 
 override_dh_strip:
 	dh_strip --dbg-package notmuch-dbg
+
+override_dh_auto_test:
+ifeq ($(DEB_HOST_ARCH),armhf)
+	TERM=vt100 dh_auto_test || true
+else
+	TERM=vt100 dh_auto_test
+endif