From bda57ab3dc48a7a7d39aab8a9621bbe6cfd35e9e Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Sun, 28 Jul 2019 00:28:18 +0200 Subject: [PATCH] debian/patches/0006-ups-conf-maxretry.patch: Add the headers to the patch --- debian/patches/0006-ups-conf-maxretry.patch | 11 +++++++++++ debian/patches/series | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/patches/0006-ups-conf-maxretry.patch b/debian/patches/0006-ups-conf-maxretry.patch index fae5806..7cf8932 100644 --- a/debian/patches/0006-ups-conf-maxretry.patch +++ b/debian/patches/0006-ups-conf-maxretry.patch @@ -1,3 +1,14 @@ +From ad7c2ed213e002bd16678c0d8de30b5e8b186a22 Mon Sep 17 00:00:00 2001 +From: Jim Klimov +Date: Sat, 28 Jan 2017 00:52:35 +0100 +Subject: [PATCH] Document and pre-set the "maxretry" option in ups.conf.sample + +--- + conf/ups.conf.sample | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/conf/ups.conf.sample b/conf/ups.conf.sample +index d8faef207..3ea13548b 100644 --- a/conf/ups.conf.sample +++ b/conf/ups.conf.sample @@ -40,6 +40,24 @@ diff --git a/debian/patches/series b/debian/patches/series index a9a4e31..13ced72 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,11 +2,11 @@ 0003-install-dev-files-in-usr.patch 0002-nut-monitor-paths.patch 0004-fix-systemd-service.patch -0006-ups-conf-maxretry.patch 0008-drop-w3c-icons.patch 0009-fix-nutshutdown-install.patch # Upstream patches +0006-ups-conf-maxretry.patch 0010-fix-nutscanner-ftbfs.patch 0011-use-pkgconfig-module.patch 0012-add-AEG-PROTECT-NAS-support.patch