* debian/patches/behave_failure_logging.patch: Refreshed.

* debian/patches/consul_import.patch: Likewise.
  * debian/patches/coverage_binary.patch: Likewise.
  * debian/patches/startup_scripts.patch: Likewise.

debian/changelog

@@ -2,6 +2,12 @@ patroni (1.5.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 
+  [ Michael Banck ]
+  * debian/patches/behave_failure_logging.patch: Refreshed.
+  * debian/patches/consul_import.patch: Likewise.
+  * debian/patches/coverage_binary.patch: Likewise.
+  * debian/patches/startup_scripts.patch: Likewise.
+
  -- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>  Fri, 02 Nov 2018 19:23:09 +0100
 
 patroni (1.5.0-12) unstable; urgency=medium

debian/patches/behave_failure_logging.patch

@@ -1,6 +1,8 @@
---- ./features/environment.py_	2018-09-25 13:20:02.659994338 +0200
-+++ ./features/environment.py	2018-09-25 13:32:35.455221988 +0200
-@@ -813,3 +813,5 @@
+Index: patroni/features/environment.py
+===================================================================
+--- patroni.orig/features/environment.py
++++ patroni/features/environment.py
+@@ -816,3 +816,5 @@ def after_feature(context, feature):
      context.pctl.stop_all()
      shutil.rmtree(os.path.join(context.pctl.patroni_path, 'data'))
      context.dcs_ctl.cleanup_service_tree()

debian/patches/consul_import.patch

@@ -2,15 +2,17 @@ Move consul import to ConsulController class
 
 Facilitates building on stretch where this module is not available
 
---- a/features/environment.py
-+++ b/features/environment.py
+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
-@@ -361,6 +360,7 @@ class AbstractDcsController(AbstractCont
+@@ -364,6 +363,7 @@ class AbstractDcsController(AbstractCont
  class ConsulController(AbstractDcsController):
  
      def __init__(self, context):

debian/patches/coverage_binary.patch

@@ -11,7 +11,7 @@ Index: patroni/features/environment.py
                                  stdout=self._log, stderr=subprocess.STDOUT, cwd=self._work_directory)
  
      def stop(self, kill=False, timeout=15, postgres=False):
-@@ -799,8 +799,8 @@ def before_all(context):
+@@ -802,8 +802,8 @@ def before_all(context):
  
  def after_all(context):
      context.dcs_ctl.stop()

debian/patches/startup_scripts.patch

@@ -49,21 +49,29 @@ Index: patroni/extras/startup-scripts/patroni.service
  
  [Service]
  Type=simple
-@@ -16,11 +14,7 @@ EnvironmentFile=-/etc/patroni_env.conf
+@@ -16,17 +14,13 @@ EnvironmentFile=-/etc/patroni_env.conf
  
  WorkingDirectory=~
  
 -# Where to send early-startup messages from the server
 -# This is normally controlled by the global default set by systemd
--# StandardOutput=syslog
+-#StandardOutput=syslog
 -
+ # Pre-commands to start watchdog device
+ # Uncomment if watchdog is part of your patroni setup
+ #ExecStartPre=-/usr/bin/sudo /sbin/modprobe softdog
+ #ExecStartPre=-/usr/bin/sudo /bin/chown postgres /dev/watchdog
+ 
+ # Start the patroni process
 -ExecStart=/bin/patroni /etc/patroni.yml
 +ExecStart=/usr/bin/patroni /etc/patroni/config.yml
  
  # Send HUP to reload from patroni.yml
  ExecReload=/bin/kill -s HUP $MAINPID
---- /dev/null	2018-10-10 13:20:47.405927503 +0200
-+++ ./extras/startup-scripts/patroni@.service	2018-10-22 18:30:47.699456103 +0200
+Index: patroni/extras/startup-scripts/patroni@.service
+===================================================================
+--- /dev/null
++++ patroni/extras/startup-scripts/patroni@.service
 @@ -0,0 +1,40 @@
 +# systemd service template for patroni instances. The actual instances will
 +# be called "patroni@version-cluster", e.g. "patroni@10-main". The