* debian/patches/patroni_service.patch: Removed, and folded into ...

* debian/patches/startup_scripts.patch: ... this.

debian/changelog

@@ -3,6 +3,8 @@ patroni (1.5.0-6) UNRELEASED; urgency=medium
   [ Michael Banck ]
   * debian/config.yml: Updated with recent changes from upstream config
     example.
+  * debian/patches/patroni_service.patch: Removed, and folded into ...
+  * debian/patches/startup_scripts.patch: ... this.
 
  -- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>  Wed, 26 Sep 2018 16:09:24 +0200
 

debian/patches/patroni_service.patch

@@ -1,10 +0,0 @@
---- a/extras/startup-scripts/patroni.service
-+++ b/extras/startup-scripts/patroni.service
-@@ -1,6 +1,7 @@
- [Unit]
- Description=Runners to orchestrate a high-availability PostgreSQL
- After=network.target
-+ConditionPathExists=/etc/patroni/config.yml
- 
- [Service]
- Type=simple

debian/patches/series

@@ -2,6 +2,5 @@ sphinx_no_mathjax.patch
 startup_scripts.patch
 coverage_binary.patch
 consul_import.patch
-patroni_service.patch
 behave_failure_logging.patch
 check_postmaster.patch

debian/patches/startup_scripts.patch

@@ -37,7 +37,7 @@ Index: patroni/extras/startup-scripts/patroni.service
 ===================================================================
 --- patroni.orig/extras/startup-scripts/patroni.service
 +++ patroni/extras/startup-scripts/patroni.service
-@@ -1,9 +1,6 @@
+@@ -1,9 +1,7 @@
 -# This is an example systemd config file for Patroni
 -# You can copy it to "/etc/systemd/system/patroni.service",
 -
@@ -45,10 +45,11 @@ Index: patroni/extras/startup-scripts/patroni.service
  Description=Runners to orchestrate a high-availability PostgreSQL
 -After=syslog.target network.target
 +After=network.target
++ConditionPathExists=/etc/patroni/config.yml
  
  [Service]
  Type=simple
-@@ -16,11 +13,7 @@ EnvironmentFile=-/etc/patroni_env.conf
+@@ -16,11 +14,7 @@ EnvironmentFile=-/etc/patroni_env.conf
  
  WorkingDirectory=~