Merge branch 'release'

diff --git a/debian/changelog b/debian/changelog
index 12d93caac69f2d2144a061d14a275aebbaff4bd4..cf400c2c2333e6c912109a0d8e6e48bef3cbd7c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/rules b/debian/rules
index fa0551a951906e686860d08a78c615f24af6e3b0..1d25f9c310fa27493fcb3544bb85703e891460f0 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
+       dh_auto_test -- V=1 NOTMUCH_SKIP_TESTS="libconfig.18 libconfig.31"
 
 override_dh_auto_build:
        dh_auto_build -- V=1