[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 01/02: revert nagios-check-libs source back to the original config path

[Evgeni Golov]

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

evgeni pushed a commit to branch master
in repository pkg-nagios-plugins-contrib.

commit 4e9f28d23fdd2a56a715b4892c4e19400117fbfc
Author: Evgeni Golov <evgeni at debian.org>
Date:   Sat Jun 7 13:32:38 2014 +0200

    revert nagios-check-libs source back to the original config path
    
    patch our version only once, but with the correct path
---
 check_libs/nagios-check-libs              |  2 +-
 debian/patches/check_libs/config_location | 11 -----------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/check_libs/nagios-check-libs b/check_libs/nagios-check-libs
index a8a89cf..977605d 100644
--- a/check_libs/nagios-check-libs
+++ b/check_libs/nagios-check-libs
@@ -71,7 +71,7 @@ if ($params->{'version'}) {
 };
 
 if (! defined $params->{'config'}) {
-	$params->{'config'} = '/etc/nagios-plugins/check-libs.conf';
+	$params->{'config'} = '/etc/nagios/check-libs.conf';
 } elsif (! -e $params->{'config'}) {
 	dief("Config file $params->{'config'} does not exist.\n");
 }
diff --git a/debian/patches/check_libs/config_location b/debian/patches/check_libs/config_location
deleted file mode 100644
index ee0181d..0000000
--- a/debian/patches/check_libs/config_location
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/check_libs/nagios-check-libs
-+++ b/check_libs/nagios-check-libs
-@@ -71,7 +71,7 @@ if ($params->{'version'}) {
- };
- 
- if (! defined $params->{'config'}) {
--	$params->{'config'} = '/etc/nagios-plugins/check-libs.conf';
-+	$params->{'config'} = '/etc/nagios/check-libs.conf';
- } elsif (! -e $params->{'config'}) {
- 	dief("Config file $params->{'config'} does not exist.\n");
- }
diff --git a/debian/patches/series b/debian/patches/series
index 5215696..f06ae5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ check_clamav/clamav_locations
 check_nfsmounts/perl_module
 check_nfsmounts/nfs_write_location
 dsa/check_packages_location
-check_libs/config_location
 check_libs/config_path
 dsa/status_directory
 dsa/check_packages-inifile

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