diff -pruN 0.37-1/debian/changelog 0.37-1ubuntu2/debian/changelog
--- 0.37-1/debian/changelog	2022-08-24 16:12:19.000000000 +0000
+++ 0.37-1ubuntu2/debian/changelog	2022-10-05 18:58:07.000000000 +0000
@@ -1,3 +1,16 @@
+notmuch (0.37-1ubuntu2) kinetic; urgency=medium
+
+  * Don't run testsuite in parallel, causing test failures.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 05 Oct 2022 20:58:07 +0200
+
+notmuch (0.37-1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 25 Aug 2022 14:33:26 +0200
+
 notmuch (0.37-1) unstable; urgency=medium
 
   * New upstream release.
@@ -23,6 +36,13 @@ notmuch (0.37~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Sun, 14 Aug 2022 07:28:22 -0300
 
+notmuch (0.36-1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 29 Apr 2022 09:58:43 +0200
+
 notmuch (0.36-1) unstable; urgency=medium
 
   * New upstream release
@@ -44,6 +64,13 @@ notmuch (0.36~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Fri, 15 Apr 2022 08:45:10 -0300
 
+notmuch (0.35-2ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 29 Mar 2022 12:41:48 +0200
+
 notmuch (0.35-2) unstable; urgency=medium
 
   * Disable test smime.4, which is broken by gmime 3.2.9 thanks to Lucas
@@ -51,6 +78,13 @@ notmuch (0.35-2) unstable; urgency=mediu
 
  -- David Bremner <bremner@debian.org>  Mon, 28 Mar 2022 11:45:11 -0600
 
+notmuch (0.35-1ubuntu2) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 07 Feb 2022 09:42:09 +0100
+
 notmuch (0.35-1) unstable; urgency=medium
 
   * New upstream release
@@ -69,6 +103,14 @@ notmuch (0.35~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Sat, 29 Jan 2022 18:14:57 -0400
 
+notmuch (0.34.3-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+    - d/rules: Disable LTO to fix FTBFS on s390x.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 10 Jan 2022 11:07:32 +0100
+
 notmuch (0.34.3-1) unstable; urgency=medium
 
   * New upstream bugfix release, with several fixes for the notmuch2
@@ -76,6 +118,14 @@ notmuch (0.34.3-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Sun, 09 Jan 2022 15:30:38 -0400
 
+notmuch (0.34.2-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+    - d/rules: Disable LTO to fix FTBFS on s390x.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 15 Dec 2021 12:35:35 +0100
+
 notmuch (0.34.2-1) unstable; urgency=medium
 
   * New upstream bugfix with release, with fixes database location in
@@ -85,6 +135,25 @@ notmuch (0.34.2-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Fri, 10 Dec 2021 09:35:43 -0400
 
+notmuch (0.34.1-1ubuntu3) jammy; urgency=medium
+
+  * d/rules: Disable LTO to fix FTBFS on s390x.
+
+ -- Sergio Durigan Junior <sergio.durigan@canonical.com>  Wed, 08 Dec 2021 20:08:48 -0500
+
+notmuch (0.34.1-1ubuntu2) jammy; urgency=medium
+
+  * No-change upload due to ruby3.0 transition, remove ruby2.7 support.
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Tue, 07 Dec 2021 11:15:58 -0300
+
+notmuch (0.34.1-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 07 Nov 2021 02:54:55 +0100
+
 notmuch (0.34.1-1) unstable; urgency=medium
 
   * New upstream bugfix release. Fixes a memory deallocation error in
@@ -111,24 +180,52 @@ notmuch (0.34~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Fri, 15 Oct 2021 08:50:57 -0300
 
+notmuch (0.33.2-1ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 05 Oct 2021 08:28:11 +0200
+
 notmuch (0.33.2-1) unstable; urgency=medium
 
   * Upstream fix for flaky/hanging tests in T355-smime
 
  -- David Bremner <bremner@debian.org>  Thu, 30 Sep 2021 08:27:10 -0300
 
+notmuch (0.33.1-1ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 15 Sep 2021 13:13:18 +0200
+
 notmuch (0.33.1-1) unstable; urgency=medium
 
   * Upstream fix for flaky tests in T590-libconfig
 
  -- David Bremner <bremner@debian.org>  Fri, 10 Sep 2021 08:28:48 -0300
 
+notmuch (0.33-2ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 07 Sep 2021 14:39:21 +0200
+
 notmuch (0.33-2) unstable; urgency=medium
 
   * Disable two flaky tests in T590-libconfig.
 
  -- David Bremner <bremner@debian.org>  Sat, 04 Sep 2021 11:29:44 -0700
 
+notmuch (0.33-1ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 04 Sep 2021 20:47:32 +0200
+
 notmuch (0.33-1) unstable; urgency=medium
 
   * New upstream release
@@ -142,6 +239,20 @@ notmuch (0.33~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Thu, 26 Aug 2021 08:27:42 -0700
 
+notmuch (0.32.3-1ubuntu2) impish; urgency=medium
+
+  * debian/patches/8675be1d.patch:
+    - cherry-pick upstream test fix, thanks Bremner!
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 20 Aug 2021 09:01:59 +0200
+
+notmuch (0.32.3-1ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 18 Aug 2021 13:23:22 +0200
+
 notmuch (0.32.3-1) unstable; urgency=medium
 
   * new upstream bugfix release
@@ -188,6 +299,20 @@ notmuch (0.32~rc1-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Sat, 24 Apr 2021 12:46:10 -0300
 
+notmuch (0.31.4-2ubuntu2) impish; urgency=medium
+
+  * Revert ignore test results on armhf, looks working now.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 30 Jun 2021 09:53:56 +0200
+
+notmuch (0.31.4-2ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 30 Jun 2021 09:23:37 +0200
+
 notmuch (0.31.4-2) unstable; urgency=medium
 
   * Cherry pick upstream commit 3f4de98e7c8, which fixes a bug where
@@ -197,6 +322,14 @@ notmuch (0.31.4-2) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Mon, 28 Jun 2021 22:48:02 -0300
 
+notmuch (0.31.4-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 19 Feb 2021 10:20:10 +0100
+
 notmuch (0.31.4-1) unstable; urgency=medium
 
   * New upstream bugfix release
@@ -205,12 +338,28 @@ notmuch (0.31.4-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Thu, 18 Feb 2021 07:23:00 -0400
 
+notmuch (0.31.3-2ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 27 Dec 2020 21:55:42 +0100
+
 notmuch (0.31.3-2) unstable; urgency=medium
 
   * Don't install gdb on hppa (skip gdb based tests)
 
  -- David Bremner <bremner@debian.org>  Sat, 26 Dec 2020 15:14:07 -0400
 
+notmuch (0.31.3-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 25 Dec 2020 22:48:10 +0100
+
 notmuch (0.31.3-1) unstable; urgency=medium
 
   * New upstream bugfix release
@@ -226,6 +375,14 @@ notmuch (0.31.2-5) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Sun, 13 Dec 2020 08:24:23 -0400
 
+notmuch (0.31.2-4ubuntu2) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 11 Dec 2020 09:32:43 +0100
+
 notmuch (0.31.2-4) unstable; urgency=medium
 
   * Move prerequisite to file targets from phony ones. Thanks to
@@ -233,6 +390,14 @@ notmuch (0.31.2-4) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Thu, 10 Dec 2020 21:02:20 -0400
 
+notmuch (0.31.2-3ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 11 Nov 2020 18:26:40 +0100
+
 notmuch (0.31.2-3) unstable; urgency=medium
 
   * Switch to debhelper compat level 13
@@ -259,6 +424,20 @@ notmuch (0.31.1-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Sun, 08 Nov 2020 07:48:22 -0400
 
+notmuch (0.31-1ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild to build with python3.9 as supported.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 24 Oct 2020 12:43:53 +0200
+
+notmuch (0.31-1ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 08 Sep 2020 14:54:26 +0200
+
 notmuch (0.31-1) unstable; urgency=medium
 
   * New upstream release
@@ -292,6 +471,14 @@ notmuch (0.31~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Sun, 16 Aug 2020 11:08:14 -0300
 
+notmuch (0.30-1ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 13 Jul 2020 12:32:51 +0200
+
 notmuch (0.30-1) unstable; urgency=medium
 
   * New upstream release
@@ -330,6 +517,24 @@ notmuch (0.30~rc0-2) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Mon, 01 Jun 2020 21:01:27 -0300
 
+notmuch (0.29.3-1ubuntu2) focal; urgency=medium
+
+  [ Rafael David Tinoco ]
+  * Sponsoring ruby2.7 transitions
+
+  [ Lucas Kanashiro ]
+  * No-change rebuild for ruby2.7
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Mon, 02 Mar 2020 16:35:24 +0000
+
+notmuch (0.29.3-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 03 Dec 2019 15:50:52 +0100
+
 notmuch (0.29.3-1) unstable; urgency=medium
 
   * New upstream bugfix release.
@@ -346,6 +551,14 @@ notmuch (0.29.2-2) experimental; urgency
 
  -- David Bremner <bremner@debian.org>  Sat, 02 Nov 2019 18:21:06 -0300
 
+notmuch (0.29.2-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 26 Oct 2019 10:02:10 +0200
+
 notmuch (0.29.2-1) unstable; urgency=medium
 
   * New upstream bug fix release: fix file descriptor leak with gzipped
@@ -353,6 +566,14 @@ notmuch (0.29.2-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Sat, 19 Oct 2019 07:23:21 -0300
 
+notmuch (0.29.1-2ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 22 Jul 2019 23:12:13 +0200
+
 notmuch (0.29.1-2) unstable; urgency=medium
 
   * Re-upload to unstable
@@ -393,6 +614,14 @@ notmuch (0.29~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Fri, 31 May 2019 08:22:21 -0300
 
+notmuch (0.28.4-1ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 06 May 2019 13:04:58 +0200
+
 notmuch (0.28.4-1) unstable; urgency=medium
 
   * New upstream bugfix release
@@ -402,6 +631,14 @@ notmuch (0.28.4-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Sun, 05 May 2019 08:08:56 -0300
 
+notmuch (0.28.3-1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 07 Mar 2019 10:23:25 +0100
+
 notmuch (0.28.3-1) unstable; urgency=medium
 
   * New upstream bugfix release.
@@ -411,12 +648,28 @@ notmuch (0.28.3-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Tue, 05 Mar 2019 15:39:09 -0400
 
+notmuch (0.28.2-1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 25 Feb 2019 12:29:35 +0100
+
 notmuch (0.28.2-1) unstable; urgency=medium
 
   * [notmuch-emacs] Invoke gpg from with --batch and --no-tty
 
  -- David Bremner <bremner@debian.org>  Sun, 17 Feb 2019 07:30:33 -0400
 
+notmuch (0.28.1-1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 05 Feb 2019 11:24:53 +0100
+
 notmuch (0.28.1-1) unstable; urgency=medium
 
   * New upstream bug fix release
@@ -425,6 +678,14 @@ notmuch (0.28.1-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Fri, 01 Feb 2019 08:05:05 -0400
 
+notmuch (0.28-2ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 09 Nov 2018 11:20:27 +0100
+
 notmuch (0.28-2) unstable; urgency=medium
 
   * Override location of bash, because /usr/bin/bash might exist
@@ -446,6 +707,14 @@ notmuch (0.28~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Wed, 03 Oct 2018 20:36:57 -0300
 
+notmuch (0.27-3ubuntu1) cosmic; urgency=medium
+
+   * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 10 Sep 2018 18:27:29 +0200
+
 notmuch (0.27-3) unstable; urgency=medium
 
   * Update Vcs-Git to use https and specify correct branch
@@ -453,12 +722,34 @@ notmuch (0.27-3) unstable; urgency=mediu
 
  -- David Bremner <bremner@debian.org>  Sat, 08 Sep 2018 18:20:10 -0300
 
+notmuch (0.27-2ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 02 Jul 2018 16:13:35 +0200
+
 notmuch (0.27-2) unstable; urgency=medium
 
   * Add texinfo as a build-dep, build info version of documentation.
 
  -- David Bremner <bremner@debian.org>  Thu, 28 Jun 2018 21:01:29 -0300
 
+notmuch (0.27-1ubuntu2) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+    - Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 14 Jun 2018 00:12:49 +0200
+
+notmuch (0.27-1ubuntu1) cosmic; urgency=medium
+
+  * Do not conflict with gdb-minimal
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 14 Jun 2018 00:11:24 +0200
+
 notmuch (0.27-1) unstable; urgency=medium
 
   * New upstream feature release
@@ -480,6 +771,14 @@ notmuch (0.27~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Sat, 26 May 2018 09:12:37 -0700
 
+notmuch (0.26.2-2ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+      see LP: #1707409
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 09 May 2018 13:47:09 +0200
+
 notmuch (0.26.2-2) unstable; urgency=medium
 
   * Mark gdb and dtach as <!nocheck>, meaning they are only needed for
@@ -490,6 +789,14 @@ notmuch (0.26.2-2) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Sun, 06 May 2018 08:36:52 -0300
 
+notmuch (0.26.2-1ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+      see LP: #1707409
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 04 May 2018 09:50:15 +0200
+
 notmuch (0.26.2-1) unstable; urgency=medium
 
   * Upstream bugfix release
@@ -504,6 +811,26 @@ notmuch (0.26.1-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Mon, 02 Apr 2018 08:08:01 -0300
 
+notmuch (0.26-1ubuntu3) bionic; urgency=high
+
+  * No change rebuild against ruby-defaults without ruby2.3 support.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 01 Mar 2018 09:35:18 +0000
+
+notmuch (0.26-1ubuntu2) bionic; urgency=medium
+
+  * No-change rebuild for ruby2.5 update.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 01 Feb 2018 19:13:56 +0000
+
+notmuch (0.26-1ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+      see LP: #1707409
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 11 Jan 2018 15:35:02 +0100
+
 notmuch (0.26-1) unstable; urgency=medium
 
   [ Daniel Kahn Gillmor ]
@@ -540,6 +867,14 @@ notmuch (0.26~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Thu, 28 Dec 2017 10:21:08 -0400
 
+notmuch (0.25.3-1ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+      see LP: #1707409
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 12 Dec 2017 14:33:04 +0100
+
 notmuch (0.25.3-1) unstable; urgency=medium
 
   * Upstream bugfix release. Fix for OpenPGP UID validity reporting,
@@ -549,6 +884,14 @@ notmuch (0.25.3-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Fri, 08 Dec 2017 21:08:00 -0400
 
+notmuch (0.25.2-1ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+      see LP: #1707409
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 06 Nov 2017 14:57:08 +0100
+
 notmuch (0.25.2-1) unstable; urgency=medium
 
   * New upstream bugfix release: fix for segfault when compiled
@@ -556,6 +899,14 @@ notmuch (0.25.2-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Sun, 05 Nov 2017 20:05:49 -0400
 
+notmuch (0.25.1-1ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+      see LP: #1707409
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 13 Sep 2017 17:15:11 +0200
+
 notmuch (0.25.1-1) unstable; urgency=medium
 
   * new upstream bugfix release: mitigation for emacs bug 28350
@@ -564,6 +915,14 @@ notmuch (0.25.1-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Mon, 11 Sep 2017 22:20:48 -0300
 
+notmuch (0.25-6ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+      see LP: #1707409
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 16 Aug 2017 11:44:21 +0200
+
 notmuch (0.25-6) unstable; urgency=medium
 
   * Bug fix: "deletes shipped file on reinstall:
@@ -572,6 +931,14 @@ notmuch (0.25-6) unstable; urgency=mediu
 
  -- David Bremner <bremner@debian.org>  Tue, 15 Aug 2017 07:52:21 -0300
 
+notmuch (0.25-5ubuntu2) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run tests but ignore failures on armhf (works on real HW)
+      see LP: #1707409
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 10 Aug 2017 19:33:03 +0200
+
 notmuch (0.25-5) unstable; urgency=medium
 
   * Bug fix: "dependency on elpa-emacs doesn't seem right", thanks
@@ -599,6 +966,14 @@ notmuch (0.25-2) unstable; urgency=mediu
 
  -- David Bremner <bremner@debian.org>  Wed, 26 Jul 2017 10:59:14 -0400
 
+notmuch (0.25-1ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: drop gdb dependency on armhf, aka don't run tests here
+      (see Debian bug 841716)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 28 Jul 2017 11:08:23 +0200
+
 notmuch (0.25-1) unstable; urgency=medium
 
   * New upstream release
@@ -607,6 +982,15 @@ notmuch (0.25-1) unstable; urgency=mediu
 
  -- David Bremner <bremner@debian.org>  Tue, 25 Jul 2017 08:28:20 -0300
 
+notmuch (0.25~rc1-2ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: drop gdb dependency on armhf, aka don't run tests here
+      (see Debian bug 841716)
+    - Switch to emacs25 build-dependency
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 26 Jul 2017 10:54:04 +0200
+
 notmuch (0.25~rc1-2) unstable; urgency=low
 
   * upload to unstable
@@ -638,6 +1022,21 @@ notmuch (0.25~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Sun, 16 Jul 2017 08:48:59 -0300
 
+notmuch (0.24.2-2ubuntu2) artful; urgency=medium
+
+  * No-change rebuild against libgmime-3.0-0
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 20 Jul 2017 03:27:29 +0000
+
+notmuch (0.24.2-2ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: drop gdb dependency on armhf, aka don't run tests here
+      (see Debian bug 841716)
+    - Switch to emacs25 build-dependency
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 04 Jul 2017 14:10:10 +0200
+
 notmuch (0.24.2-2) unstable; urgency=medium
 
   * rebuild for unstable
@@ -689,18 +1088,45 @@ notmuch (0.24~rc0-1) experimental; urgen
 
  -- David Bremner <bremner@debian.org>  Sun, 05 Mar 2017 19:32:08 -0400
 
+notmuch (0.23.7-3ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: drop gdb dependency on armhf, aka don't run tests here
+      (see Debian bug 841716)
+    - Switch to emacs25 build-dependency
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 04 Apr 2017 12:55:44 +0200
+
 notmuch (0.23.7-3) unstable; urgency=medium
 
   * Cherry pick fixes to dump header from 0.24.1
 
  -- David Bremner <bremner@debian.org>  Sat, 01 Apr 2017 21:09:36 -0300
 
+notmuch (0.23.7-2ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: drop gdb dependency on armhf, aka don't run tests here
+      (see Debian bug 841716)
+    - Switch to emacs25 build-dependency
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 21 Mar 2017 14:12:09 +0100
+
 notmuch (0.23.7-2) unstable; urgency=medium
 
   * Cherry pick 06adc276, fix use after free in libnotmuch4
 
  -- David Bremner <bremner@debian.org>  Sun, 19 Mar 2017 09:38:17 -0300
 
+notmuch (0.23.7-1ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: drop gdb dependency on armhf, aka don't run tests here
+      (see Debian bug 841716)
+    - Switch to emacs25 build-dependency
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 01 Mar 2017 11:10:09 +0100
+
 notmuch (0.23.7-1) unstable; urgency=medium
 
   * Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths.
@@ -708,6 +1134,15 @@ notmuch (0.23.7-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Tue, 28 Feb 2017 20:39:30 -0400
 
+notmuch (0.23.5-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: drop gdb dependency on armhf, aka don't run tests here
+      (see Debian bug 841716)
+    - Switch to emacs25 build-dependency
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 01 Feb 2017 11:31:48 +0100
+
 notmuch (0.23.5-1) unstable; urgency=medium
 
   * Remove RUNPATH from /usr/bin/notmuch
@@ -734,6 +1169,15 @@ notmuch (0.23.3-2) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Thu, 01 Dec 2016 08:06:59 -0400
 
+notmuch (0.23.3-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: drop gdb dependency on armhf, aka don't run tests here
+      (see Debian bug 841716)
+    - Switch to emacs25 build-dependency
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 28 Nov 2016 15:47:30 +0100
+
 notmuch (0.23.3-1) unstable; urgency=medium
 
   * Re-enable test suite
@@ -753,6 +1197,33 @@ notmuch (0.23.2-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Thu, 10 Nov 2016 22:36:04 -0400
 
+notmuch (0.23.1-1ubuntu4) zesty; urgency=medium
+
+  * Build-depends on emacs25-lucid as well.
+  * Let notmuch-emacs depend on emacs25 as well.
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Tue, 15 Nov 2016 17:50:44 +0200
+
+notmuch (0.23.1-1ubuntu3) zesty; urgency=medium
+
+  * Switch to emacs25 build-dependency.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 15 Nov 2016 16:23:09 +0100
+
+notmuch (0.23.1-1ubuntu2) zesty; urgency=medium
+
+  * No-change rebuild for libxapian30
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Wed, 02 Nov 2016 11:48:59 +0000
+
+notmuch (0.23.1-1ubuntu1) zesty; urgency=medium
+
+  * Resync with Debian unstable.
+  * debian/rules: drop gdb dependency on armhf, aka don't run tests here
+    (see Debian bug 841716)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 24 Oct 2016 23:42:28 +0200
+
 notmuch (0.23.1-1) unstable; urgency=medium
 
   * New upstream bugfix release
@@ -763,6 +1234,18 @@ notmuch (0.23.1-1) unstable; urgency=med
 
  -- David Bremner <bremner@debian.org>  Sun, 23 Oct 2016 22:06:12 -0300
 
+notmuch (0.23-2ubuntu1) zesty; 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.
+  * Dropped changes:
+    - Ignore testsuite on armhf; this was a workaround for gdb which
+      should not be needed.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 18 Oct 2016 17:59:38 -0700
+
 notmuch (0.23-2) unstable; urgency=medium
 
   * upload to unstable
@@ -802,6 +1285,22 @@ notmuch (0.22.2-1) unstable; urgency=med
 
  -- 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
@@ -809,6 +1308,15 @@ notmuch (0.22.1-3) unstable; urgency=med
 
  -- 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.
@@ -851,6 +1359,21 @@ notmuch (0.22~rc0-1) experimental; urgen
 
  -- 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
@@ -915,6 +1438,25 @@ notmuch (0.20.2-2) unstable; urgency=med
 
  -- 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 -pruN 0.37-1/debian/control 0.37-1ubuntu2/debian/control
--- 0.37-1/debian/control	2022-08-24 16:12:19.000000000 +0000
+++ 0.37-1ubuntu2/debian/control	2022-08-24 22:17:27.000000000 +0000
@@ -7,7 +7,6 @@ Uploaders:
  David Bremner <bremner@debian.org>,
 Build-Conflicts:
  gdb [ia64 mips mips64el hppa],
- gdb-minimal,
  ruby1.8,
 Build-Depends:
  bash-completion (>=1.9.0~),
diff -pruN 0.37-1/debian/rules 0.37-1ubuntu2/debian/rules
--- 0.37-1/debian/rules	2022-08-24 16:12:19.000000000 +0000
+++ 0.37-1ubuntu2/debian/rules	2022-10-05 18:58:07.000000000 +0000
@@ -34,3 +34,6 @@ override_dh_auto_install:
 	PYBUILD_NAME=notmuch2 dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python-cffi
 	$(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install
 	dh_auto_install --sourcedirectory bindings/ruby
+
+override_dh_auto_test:
+	dh_auto_test --no-parallel
