* debian/patches/consul_import.patch: Removed, applied upstream.

* debian/patches/acceptance_tests_timeouts.patch: Likewise.

debian/changelog

@@ -2,6 +2,10 @@ patroni (1.6.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 
+  [ Michael Banck ]
+  * debian/patches/consul_import.patch: Removed, applied upstream.
+  * debian/patches/acceptance_tests_timeouts.patch: Likewise.
+
  -- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>  Sat, 16 Nov 2019 16:28:35 +0100
 
 patroni (1.6.1-2) unstable; urgency=medium

debian/patches/acceptance_tests_timeouts.patch

@@ -1,9 +0,0 @@
---- ./features/custom_bootstrap.feature.orig	2019-10-07 20:16:35.549032499 +0200
-+++ ./features/custom_bootstrap.feature	2019-10-07 20:16:43.873104835 +0200
-@@ -13,5 +13,5 @@
-     Given I add the table bar to postgres1
-     And I do a backup of postgres1
-     When I start postgres2 in a cluster batman2 from backup
--    Then postgres2 is a leader of batman2 after 10 seconds
-+    Then postgres2 is a leader of batman2 after 30 seconds
-     And table bar is present on postgres2 after 10 seconds

debian/patches/consul_import.patch

@@ -1,22 +0,0 @@
-Move consul import to ConsulController class
-
-Facilitates building on stretch where this module is not available
-
-Index: patroni/features/environment.py
-===================================================================
---- patroni.orig/features/environment.py
-+++ patroni/features/environment.py
-@@ -1,5 +1,4 @@
- import abc
--import consul
- import datetime
- import etcd
- import kazoo.client
-@@ -372,6 +371,7 @@ class AbstractDcsController(AbstractCont
- class ConsulController(AbstractDcsController):
- 
-     def __init__(self, context):
-+        import consul
-         super(ConsulController, self).__init__(context)
-         os.environ['PATRONI_CONSUL_HOST'] = 'localhost:8500'
-         os.environ['PATRONI_CONSUL_REGISTER_SERVICE'] = 'on'

debian/patches/series

@@ -1,5 +1,3 @@
 startup_scripts.patch
-consul_import.patch
 check_postmaster.patch
 acceptance_tests_system_patroni.patch
-acceptance_tests_timeouts.patch