3 files changed, 106 insertions, 0 deletions
diff --git a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch
new file mode 100644
index 0000000..157b62e
--- /dev/null
+++ b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch
@@ -0,0 +1,47 @@
+From: Guilhem Moulin <guilhem@debian.org>
+Date: Sun, 20 Jan 2019 21:09:43 +0100
+Subject: Mention the Debian BTS in the manpages.
+Forwarded: not-needed
+
+---
+ doc/interimap.1.md |   10 +++++++++-
+ doc/pullimap.1.md  |    6 ++++++
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+--- a/doc/interimap.1.md
++++ b/doc/interimap.1.md
+@@ -542,10 +542,18 @@ Standards
+    and Quick Mailbox Resynchronization (`QRESYNC`)_,
+    [RFC 7162], May 2014.
+ 
++Bugs and feedback
++=================
++
++Bugs or feature requests for `interimap` should be filed with the
++Debian project's bug tracker at <<https://www.debian.org/Bugs/>>.
++
+ See also
+ ========
+ 
+-A _getting started_ guide is available [there](getting-started.html).
++A _getting started_ guide is available locally at
++<<file:///usr/share/doc/interimap/getting-started.md.gz>>, and
++online at <<https://guilhem.org/interimap/getting-started.html>>.
+ 
+ [RFC 7162]: https://tools.ietf.org/html/rfc7162
+ [RFC 5258]: https://tools.ietf.org/html/rfc5258
+--- a/doc/pullimap.1.md
++++ b/doc/pullimap.1.md
+@@ -359,6 +359,12 @@ Standards
+  * J. Klensin, _Simple Mail Transfer Protocol_,
+    [RFC 5321], October 2008.
+ 
++Bugs and feedback
++=================
++
++Bugs or feature requests for `pullimap` should be filed with the
++Debian project's bug tracker at <<https://www.debian.org/Bugs/>>.
++
+ [RFC 4315]: https://tools.ietf.org/html/rfc4315
+ [RFC 2177]: https://tools.ietf.org/html/rfc2177
+ [RFC 2595]: https://tools.ietf.org/html/rfc2595
diff --git a/debian/patches/Skip-randomized-tests.patch b/debian/patches/Skip-randomized-tests.patch
new file mode 100644
index 0000000..a51aa04
--- /dev/null
+++ b/debian/patches/Skip-randomized-tests.patch
@@ -0,0 +1,57 @@
+commit 5bc242612a514d5091b1a05e5a087d54454e390a
+Author: Guilhem Moulin <guilhem@debian.org>
+Date:   Wed Jan 29 13:49:10 2020 +0100
+
+Avoid running randomized tests on the build daemons
+
+These tests are racy and can fail in subtle ways depending on the
+machine load and speed.  Basically `interimap --watch=1` is spawnedin
+the background, then random events (new messages, deletions, flag
+changes, etc.) are sent for for one minute, and the background process
+is later terminated and the mail stores compared.  The problem is how to
+stop the background process after the loop.  What's done right now is it
+waits for 5 seconds and sends a SIGTERM; unfortunately $n sec is
+arbitrary and might not be enough, depending on the machine and load.
+Ideally a SIGUSR1 would cause it to continue until a clean state is
+reached, then stop.
+
+These tests most sense in the context of upstream development, so for
+now we skip them in the Debian context.
+
+---
+ tests/list |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+--- a/tests/list
++++ b/tests/list
+@@ -41,8 +41,8 @@ repair  --repair
+     preauth-plaintext       abort on MiTM via PREAUTH greeting
+ 
+ compress    COMPRESS=DEFLATE
+-condstore   CONDSTORE
+-split-set   Split large sets to avoid extra-long command lines
++#condstore   CONDSTORE
++#split-set   Split large sets to avoid extra-long command lines
+ 
+ . SSL/TLS
+     starttls-logindisabled  LOGINDISABLED STARTTLS
+@@ -54,11 +54,11 @@ split-set   Split large sets to avoid ex
+     tls-rsa+ecdsa           pubkey fingerprint pinning for hybrid RSA+ECDSA
+     tls-protocols           force TLS protocol versions
+ 
+-. Live synchronization (60s)
+-    sync-live            local/remote simulation
+-    sync-live-crippled   local/remote simulation (crippled remote)
+-    sync-live-tls        local/remote simulation (TLS remote)
+-    sync-live-multi      local/remote1+remote2+remote3 simulation (3 local namespaces)
+-
+-. pullimap
+-    ... pullimap
++#. Live synchronization (60s)
++#    sync-live            local/remote simulation
++#    sync-live-crippled   local/remote simulation (crippled remote)
++#    sync-live-tls        local/remote simulation (TLS remote)
++#    sync-live-multi      local/remote1+remote2+remote3 simulation (3 local namespaces)
++#
++#. pullimap
++#    ... pullimap
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e237c35
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Mention-the-Debian-BTS-in-the-manpages.patch
+Skip-randomized-tests.patch