From b1965740b632e6b905991425692807f98a5eb748 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 29 Jan 2020 12:25:28 +0100
Subject: d/patches: Remove patches applied upstream.

---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  2 -
 ...on-t-redirect-stderr-by-process-substitut.patch | 34 -----------
 ...rease-timeout-from-2-to-5s-after-backgrou.patch | 68 ----------------------
 4 files changed, 1 insertion(+), 104 deletions(-)
 delete mode 100644 debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch
 delete mode 100644 debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch

diff --git a/debian/changelog b/debian/changelog
index 084bed6..5341328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 interimap (0.5-1) UNRELEASED; urgency=medium
 
   * d/control: Bump Standards-Version to 4.5.0 (no changes necessary).
+  * d/patches: Remove patches applied upstream.
 
  -- Guilhem Moulin <guilhem@debian.org>  Wed, 29 Jan 2020 12:22:21 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index e7fcfbe..649d1d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 Ignore-custom-lib-PATH.patch
 Mention-the-Debian-BTS-in-the-manpages.patch
-tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch
-tests-run-Don-t-redirect-stderr-by-process-substitut.patch
diff --git a/debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch b/debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch
deleted file mode 100644
index 1a300f2..0000000
--- a/debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 49d7a90c159b12173ce202fb9b101465b87da96c Mon Sep 17 00:00:00 2001
-From: Guilhem Moulin <guilhem@fripost.org>
-Date: Sun, 15 Dec 2019 03:38:59 +0100
-Subject: [PATCH 2/2] tests/run: Don't redirect stderr by process substitution.
-
-This seems to cause timing issues.
----
- tests/run | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/tests/run b/tests/run
-index a34e4a9..4aa0685 100755
---- a/tests/run
-+++ b/tests/run
-@@ -202,11 +202,13 @@ prepare
- interimap() { _interimap_cmd "interimap" "$@"; }
- pullimap()  { _interimap_cmd "pullimap"  "$@"; }
- _interimap_cmd() {
--    declare -a ENVIRON=() r=0
--    local script="$1"
-+    declare -a ENVIRON=()
-+    local script="$1" rv=0
-     shift
-     environ_set "local"
--    env -i "${ENVIRON[@]}" perl -I./lib -T "./$script" "$@" 2> >(tee "$STDERR" >&2)
-+    env -i "${ENVIRON[@]}" perl -I./lib -T "./$script" "$@" 2>"$STDERR" || rv=$?
-+    cat <"$STDERR" >&2
-+    return $rv
- }
- interimap_init() {
-     local u="${1-remote}"
--- 
-2.24.0
-
diff --git a/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch b/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch
deleted file mode 100644
index 76b678b..0000000
--- a/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a7517e35cf0c835fcb68db56d8634fab9b4d5f0d Mon Sep 17 00:00:00 2001
-From: Guilhem Moulin <guilhem@fripost.org>
-Date: Sun, 15 Dec 2019 03:35:51 +0100
-Subject: [PATCH 1/2] tests/*/t: Increase timeout from 2 to 5s after background
- syncs.
-
----
- tests/condstore/t       | 2 +-
- tests/pullimap/t        | 2 +-
- tests/sync-live-multi/t | 2 +-
- tests/sync-live/t       | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/condstore/t b/tests/condstore/t
-index d4da50f..1963b2b 100644
---- a/tests/condstore/t
-+++ b/tests/condstore/t
-@@ -31,7 +31,7 @@ while [ $(date +%s) -le $timer ]; do
-     doveadm -u "$u" flags "$a" "$f" mailbox "INBOX" "${seqs//$'\n'/,}"
-     sleep "0.0$(shuf -n1 -i10-99)" # 10 to 99ms
- done
--sleep 2
-+sleep 5
- 
- ptree_abort $PID
- trap - EXIT INT TERM
-diff --git a/tests/pullimap/t b/tests/pullimap/t
-index 79da3e0..115432d 100644
---- a/tests/pullimap/t
-+++ b/tests/pullimap/t
-@@ -123,7 +123,7 @@ while [ $(date +%s) -le $timer ]; do
-     sleep "$s"
- done
- 
--sleep 2
-+sleep 5
- ptree_abort $PID
- trap - EXIT INT TERM
- 
-diff --git a/tests/sync-live-multi/t b/tests/sync-live-multi/t
-index 9b129ec..ba7f326 100644
---- a/tests/sync-live-multi/t
-+++ b/tests/sync-live-multi/t
-@@ -96,7 +96,7 @@ done
- # wait a little longer so interimap has time to run loop() again and
- # synchronize outstanding changes, then terminate the processes we
- # started above
--sleep 2
-+sleep 5
- 
- ptree_abort ${PID[@]}
- trap - EXIT INT TERM
-diff --git a/tests/sync-live/t b/tests/sync-live/t
-index 19d1e08..5f5b291 100644
---- a/tests/sync-live/t
-+++ b/tests/sync-live/t
-@@ -65,7 +65,7 @@ done
- # wait a little longer so interimap has time to run loop() again and
- # synchronize outstanding changes, then terminate the process we started
- # above
--sleep 2
-+sleep 5
- 
- ptree_abort $PID
- trap - EXIT INT TERM
--- 
-2.24.0
-
-- 
cgit v1.2.3