[pkg-nagios-changes] [Git][nagios-team/centreon-plugins][debian/master] 3 commits: Reformat d/control, d/docs, d/install and d/watch to match the team standards
Baptiste Beauplat (@lyknode)
gitlab at salsa.debian.org
Sat Sep 11 17:07:25 BST 2021
Baptiste Beauplat pushed to branch debian/master at Debian Nagios Maintainer Group / centreon-plugins
Commits:
2a3035ab by Baptiste Beauplat at 2021-09-11T18:06:32+02:00
Reformat d/control, d/docs, d/install and d/watch to match the team standards
Gbp-Dch: Ignore
- - - - -
9cebc5d2 by Baptiste Beauplat at 2021-09-11T18:06:43+02:00
Fix plugin detection when not located directly under the main script
Gbp-Dch: Ignore
- - - - -
8bc06e1e by Baptiste Beauplat at 2021-09-11T18:06:48+02:00
Rename 0001 patch to be more explicit
Gbp-Dch: Ignore
- - - - -
6 changed files:
- debian/control
- debian/docs
- debian/install
- debian/patches/0001-Fix-lib-path-in-centreon_plugins-script.patch → debian/patches/0001-Support-plugins-not-located-directly-under-the-main-script.patch
- debian/patches/series
- debian/watch
Changes:
=====================================
debian/control
=====================================
@@ -3,7 +3,8 @@ Section: admin
Priority: optional
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
Uploaders: Baptiste Beauplat <lyknode at debian.org>
-Build-Depends: debhelper-compat (= 13), python3-sphinx
+Build-Depends: debhelper-compat (= 13),
+ python3-sphinx
Standards-Version: 4.6.0
Homepage: https://github.com/centreon/centreon-plugins
Vcs-Browser: https://salsa.debian.org/nagios-team/centreon-plugins
@@ -12,22 +13,22 @@ Rules-Requires-Root: no
Package: centreon-plugins
Architecture: all
-Depends: ${perl:Depends},
- ${misc:Depends},
- ${sphinxdoc:Depends}
+Depends: ${misc:Depends},
+ ${perl:Depends},
+ ${sphinxdoc:Depends}
Built-Using: ${sphinxdoc:Built-Using}
Recommends: libdbd-mysql-perl,
- libdbd-pg-perl,
- libdbi-perl,
- libjson-perl,
- libmemcached-libmemcached-perl,
- libnet-dns-perl,
- libnet-ntp-perl,
- libnet-telnet-perl,
- libsnmp-perl,
- libwww-perl,
- libxml-libxml-perl,
- libxml-xpath-perl
+ libdbd-pg-perl,
+ libdbi-perl,
+ libjson-perl,
+ libmemcached-libmemcached-perl,
+ libnet-dns-perl,
+ libnet-ntp-perl,
+ libnet-telnet-perl,
+ libsnmp-perl,
+ libwww-perl,
+ libxml-libxml-perl,
+ libxml-xpath-perl
Description: Collection of Nagios plugins to monitor OS, services and network devices
Free and open source project to monitor systems. The project can be
used with Centreon and all monitoring software compatible with Nagios
=====================================
debian/docs
=====================================
@@ -1,2 +1,2 @@
-example
README.md
+example
=====================================
debian/install
=====================================
@@ -1,13 +1,15 @@
-apps usr/lib/centreon-plugins/
-blockchain usr/lib/centreon-plugins/
-centreon usr/lib/centreon-plugins/
-cloud usr/lib/centreon-plugins/
-database usr/lib/centreon-plugins/
-hardware usr/lib/centreon-plugins/
-network usr/lib/centreon-plugins/
-notification usr/lib/centreon-plugins/
-os usr/lib/centreon-plugins/
-snmp_standard usr/lib/centreon-plugins/
-storage usr/lib/centreon-plugins/
-centreon_plugins.pl usr/lib/nagios/plugins
+apps usr/lib/centreon-plugins/
+blockchain usr/lib/centreon-plugins/
+centreon usr/lib/centreon-plugins/
+cloud usr/lib/centreon-plugins/
+database usr/lib/centreon-plugins/
+hardware usr/lib/centreon-plugins/
+network usr/lib/centreon-plugins/
+notification usr/lib/centreon-plugins/
+os usr/lib/centreon-plugins/
+snmp_standard usr/lib/centreon-plugins/
+storage usr/lib/centreon-plugins/
+
+centreon_plugins.pl usr/lib/nagios/plugins/
+
doc/en/_build/html/* usr/share/doc/centreon-plugins/html/
=====================================
debian/patches/0001-Fix-lib-path-in-centreon_plugins-script.patch → debian/patches/0001-Support-plugins-not-located-directly-under-the-main-script.patch
=====================================
@@ -1,16 +1,30 @@
From: Baptiste Beauplat <lyknode at debian.org>
Date: Wed, 8 Sep 2021 20:01:17 +0200
-Subject: Fix lib path in centreon_plugins script
+Subject: Support plugins not located directly under the main script
To avoid clutturing /usr/lib/nagios/plugins, all perl modules have been
-moved to /usr/lib/centreon-plugins. This patch updates centreon_plugins
-script to the correct path.
+moved to /usr/lib/centreon-plugins. This patch updates FindBin instances to
+locate the plugins correctly.
Forwarded: not-needed
---
- centreon_plugins.pl | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ centreon/plugins/script.pm | 2 +-
+ centreon_plugins.pl | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/centreon/plugins/script.pm b/centreon/plugins/script.pm
+index 3992744..6422d63 100644
+--- a/centreon/plugins/script.pm
++++ b/centreon/plugins/script.pm
+@@ -278,7 +278,7 @@ sub display_list_plugin {
+ output => $self->{output}, module => 'FindBin',
+ error_msg => "Cannot load module 'FindBin'."
+ );
+- my $directory = $FindBin::Bin;
++ my $directory = $FindBin::Bin . '/../../centreon-plugins';
+ if (defined($ENV{PAR_TEMP})) {
+ $directory = $ENV{PAR_TEMP} . '/inc/lib';
+ }
diff --git a/centreon_plugins.pl b/centreon_plugins.pl
index 3a08ffe..b41266d 100755
--- a/centreon_plugins.pl
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,3 @@
-0001-Fix-lib-path-in-centreon_plugins-script.patch
+0001-Support-plugins-not-located-directly-under-the-main-script.patch
0002-Use-tmp-as-default-location-for-statefile.patch
0003-Remove-unsed-intersphinx-links.patch
=====================================
debian/watch
=====================================
@@ -1,4 +1,7 @@
version=4
-opts="pgpmode=none,uversionmangle=s/^/0.0~/,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
- https://github.com/centreon/@PACKAGE@/tags \
- (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
+opts=\
+pgpmode=none,\
+uversionmangle=s/^/0.0~/,\
+filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz% \
+https://github.com/centreon/@PACKAGE@/tags \
+(?:.*?/)?v?(\d[\d.]*)\.tar\.gz
View it on GitLab: https://salsa.debian.org/nagios-team/centreon-plugins/-/compare/c4f8d240cd876e4c9424c91b9ff6b919eb17eecc...8bc06e1ec0dd9eb1246faea896e7fc8d793f0b5f
--
View it on GitLab: https://salsa.debian.org/nagios-team/centreon-plugins/-/compare/c4f8d240cd876e4c9424c91b9ff6b919eb17eecc...8bc06e1ec0dd9eb1246faea896e7fc8d793f0b5f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20210911/32010aaa/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list