[Pkg-nagios-changes] [pkg-nrpe] 04/08: Drop 10_reproducible_build.patch, applied upstream. Refresh remaining patches.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository pkg-nrpe.

commit aa8c851b045b96f00121bd71c1aec9ffa8b18738
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Apr 19 19:22:03 2017 +0200

    Drop 10_reproducible_build.patch, applied upstream. Refresh remaining patches.
---
 debian/changelog                                   |  2 ++
 .../02_nrpe.cfg_local-include_support_nrpe.d.patch |  2 +-
 debian/patches/10_reproducible_build.patch         | 24 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a091803..c4ed7e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ nagios-nrpe (3.1.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Fix typo in manpage.
     (closes: #856658)
+  * Drop 10_reproducible_build.patch, applied upstream.
+    Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 19 Apr 2017 18:53:10 +0200
 
diff --git a/debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch b/debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch
index 29f9f83..8b583cf 100644
--- a/debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch
+++ b/debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/sample-config/nrpe.cfg.in
 +++ b/sample-config/nrpe.cfg.in
-@@ -301,3 +301,14 @@ command[check_total_procs]=@pluginsdir@/
+@@ -317,3 +317,14 @@ command[check_total_procs]=@pluginsdir@/
  #command[check_load]=@pluginsdir@/check_load -w $ARG1$ -c $ARG2$
  #command[check_disk]=@pluginsdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
  #command[check_procs]=@pluginsdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
diff --git a/debian/patches/10_reproducible_build.patch b/debian/patches/10_reproducible_build.patch
deleted file mode 100644
index 9d8ce63..0000000
--- a/debian/patches/10_reproducible_build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Make the build reproducible.
-Author: Chris Lamb <lamby at debian.org>
-Bug-Debian: https://bugs.debian.org/834857
-Forwarded: https://github.com/NagiosEnterprises/nrpe/pull/78
-Applied-Upstream: https://github.com/NagiosEnterprises/nrpe/commit/c6ca9766cae19bc194efa68ed85999e9c9756422
-
---- a/update-version
-+++ b/update-version
-@@ -20,11 +20,11 @@ fi
- 
- # Get date (two formats)
- if [ -n "$2" ]; then
--    LONGDATE=`date -d "$2" "+%B %d, %Y"`
--    SHORTDATE=`date -d "$2" "+%m-%d-%Y"`
-+    LONGDATE=$(LC_ALL=C date -u -d "$2" "+%B %d, %Y")
-+    SHORTDATE=$(date -u -d "$2" "+%m-%d-%Y")
- else
--    LONGDATE=`date "+%B %d, %Y"`
--    SHORTDATE=`date "+%m-%d-%Y"`
-+    LONGDATE=$(LC_ALL=C date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%B %d, %Y")
-+    SHORTDATE=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%m-%d-%Y")
- fi
- 
- # Current version number
diff --git a/debian/patches/series b/debian/patches/series
index 0d52ab0..15e2844 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 02_nrpe.cfg_local-include_support_nrpe.d.patch
 07_warn_ssloption.patch
-10_reproducible_build.patch
 11_reproducible_dh.h.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nrpe.git