Merge branch 'release'

diff --git a/debian/changelog b/debian/changelog
index 35bb98cd1a8d41a6a1cc985728e887615c63c6e3..8ed6d55767d08f53a112d233de8abc035049950b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.35-2) unstable; urgency=medium
+
+  * Disable test smime.4, which is broken by gmime 3.2.9 thanks to Lucas
+    Nussbaum for the report (Closes: #1008462).
+
+ -- David Bremner <bremner@debian.org>  Mon, 28 Mar 2022 11:45:11 -0600
+
 notmuch (0.35-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/rules b/debian/rules
index 558671261bf0f93ae1e441ea2bb31e3267695a72..0210dc32bc9c908ced4e02052ea717271033fcdd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_auto_configure:
                --localstatedir=/var
 
 override_dh_auto_test:
-       dh_auto_test -- V=1
+       NOTMUCH_SKIP_TESTS=smime.4 dh_auto_test -- V=1
 
 override_dh_auto_build:
        dh_auto_build -- V=1 all sphinx-html