diff options
| -rw-r--r-- | debian/gbp.conf | 3 | ||||
| -rw-r--r-- | debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch | 14 | ||||
| -rw-r--r-- | debian/patches/Skip-randomized-tests.patch | 17 |
3 files changed, 21 insertions, 13 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf index 692618f..97c190b 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -4,3 +4,6 @@ debian-branch = debian/latest upstream-tag = v%(version)s debian-tag = debian/%(version)s pristine-tar = False + +[pq] +patch-numbers = False diff --git a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch index 89469c6..fefcf37 100644 --- a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch +++ b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch @@ -1,16 +1,18 @@ 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 +Forwarded: not-needed --- - doc/interimap.1.md | 10 +++++++++- - doc/pullimap.1.md | 6 ++++++ + doc/interimap.1.md | 10 +++++++++- + doc/pullimap.1.md | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) +diff --git a/doc/interimap.1.md b/doc/interimap.1.md +index 2d588ae..03adbf5 100644 --- a/doc/interimap.1.md +++ b/doc/interimap.1.md -@@ -555,10 +555,18 @@ Standards +@@ -574,10 +574,18 @@ Standards and Quick Mailbox Resynchronization (`QRESYNC`)_, [RFC 7162], May 2014. @@ -30,9 +32,11 @@ Forwarded: not-needed [RFC 7162]: https://tools.ietf.org/html/rfc7162 [RFC 5258]: https://tools.ietf.org/html/rfc5258 +diff --git a/doc/pullimap.1.md b/doc/pullimap.1.md +index 89969b2..900221a 100644 --- a/doc/pullimap.1.md +++ b/doc/pullimap.1.md -@@ -372,6 +372,12 @@ Standards +@@ -391,6 +391,12 @@ Standards * J. Klensin, _Simple Mail Transfer Protocol_, [RFC 5321], October 2008. diff --git a/debian/patches/Skip-randomized-tests.patch b/debian/patches/Skip-randomized-tests.patch index 837cbfc..14b4ba0 100644 --- a/debian/patches/Skip-randomized-tests.patch +++ b/debian/patches/Skip-randomized-tests.patch @@ -1,8 +1,6 @@ -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 +From: Guilhem Moulin <guilhem@debian.org> +Date: Wed, 29 Jan 2020 13:49:10 +0100 +Subject: 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 @@ -18,10 +16,13 @@ reached, then stop. These tests most sense in the context of upstream development, so for now we skip them in the Debian context. +Forwarded: not-needed --- - tests/list | 20 ++++++++++---------- + tests/list | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) +diff --git a/tests/list b/tests/list +index d1058ba..d6b3ec0 100644 --- a/tests/list +++ b/tests/list @@ -41,8 +41,8 @@ repair --repair @@ -35,9 +36,9 @@ now we skip them in the Debian context. . SSL/TLS starttls-logindisabled LOGINDISABLED STARTTLS -@@ -55,11 +55,11 @@ split-set Split large sets to avoid ex - tls-sni TLS servername extension (SNI) +@@ -56,11 +56,11 @@ split-set Split large sets to avoid extra-long command lines tls-protocols force TLS protocol versions + tls-ciphers force TLS cipher list/suites -. Live synchronization (60s) - sync-live local/remote simulation |