Split packages out

Create separate -client and -server packages, in an attempt to keep the
increasing number of plugins and dependencies down.

diff --git a/Makefile b/Makefile
index 445f331b4c1441f43a9efd6f0cb1ee031db77b9a..bf9ee844be666b069884dddb8041153e5aa2edc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,7 @@ check_ldaps_ip: src/check_ldaps_ip.c
 
 install:
        $(INSTALL) -d $(DSTPLUGINDIR)
-       $(INSTALL) -m 0755 $(PLUGINDIR)/check_cert $(DSTPLUGINDIR)
-       $(INSTALL) -m 0755 $(PLUGINDIR)/check_md_raid $(DSTPLUGINDIR)
-       $(INSTALL) -m 0755 $(PLUGINDIR)/check_ldaps_ip $(DSTPLUGINDIR)
-       $(INSTALL) -m 0755 $(PLUGINDIR)/check_networkclients $(DSTPLUGINDIR)
-       $(INSTALL) -m 0755 $(PLUGINDIR)/check_krb5 $(DSTPLUGINDIR)
-       $(INSTALL) -m 0755 $(PLUGINDIR)/check_configtool $(DSTPLUGINDIR)
+       $(INSTALL) -m 0755 $(PLUGINDIR)/* $(DSTPLUGINDIR)/
 
 clean:
        $(RM) plugins/check_ldaps_ip

diff --git a/debian/changelog b/debian/changelog
index 27a376ff998031d552c4d687f5e52545654e7c97..dbee5b9f6bc4536af87860c15c3b2f7fbd215af9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nagios-plugins-local (0.11) unstable; urgency=low
+
+  * Split package out into multiple packages:
+    - nagios-plugins-local-server: plugins that should run on the nagios
+      server 
+    - nagios-plugins-local-client: plugins that should run on individual
+      clients
+    - nagios-plugins-local: transitional empty package that merely depends on
+      nagios-plugins-local-client
+
+ -- Michael Howe <michael@michaelhowe.org>  Sun, 20 Dec 2015 11:42:30 +0000
+
 nagios-plugins-local (0.10) unstable; urgency=medium
 
   * Fix Makefile 

diff --git a/debian/control b/debian/control
index b7f9603f1c17dbf68627e2526c59a9b7b2a230fd..cfe817b1a3d104b9cec6560970dfaa537ac5c7a6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,33 @@ Homepage:
 
 Package: nagios-plugins-local
 Architecture: any
-Depends: ${misc:Depends}, perl, python, libc6, gnutls-bin, libnet-telnet-perl, libnagios-plugin-perl, libregexp-common-perl, libauthen-krb5-perl, libtimedate-perl, liburi-perl
+Depends: nagios-plugins-local-client (= ${source:Version} )
+Description: Transitional package to nagios-plugins-local-client
+ nagios-plugins-local has been split into two.  Systems running nrpe should use
+ nagios-plugins-local-client instead.
+
+Package: nagios-plugins-local-server
+Architecture: any
+Depends: ${misc:Depends},
+ perl, 
+ python,
+ libc6,
+ libnet-telnet-perl,
+ libregexp-common-perl,
+ libauthen-krb5-perl,
+ nagios-nrpe-plugins-local (= ${source:Version})
 Description: Local nagios plugins
- Nagios plugins customized for use on michaelhowe.org hosts.
+ Nagios plugins for use on the michaelhowe.org nagios host.
+
+Package: nagios-plugins-local-client
+Architecture: any
+Depends: ${misc:Depends},
+ perl,
+ python,
+ gnutls-bin,
+ libnagios-plugin-perl,
+ libtimedate-perl,
+ liburi-perl
+Description: Local nagios plugins (NRPE hosts)
+ Nagios plugins customized for use on michaelhowe.org hosts, likely to need to
+ run on all hosts.

diff --git a/debian/nagios-plugins-local-client.install b/debian/nagios-plugins-local-client.install
new file mode 100644 (file)
index 0000000..4f4f31d
--- /dev/null
+++ b/debian/nagios-plugins-local-client.install
@@ -0,0 +1,3 @@
+/usr/lib/nagios/plugins/check_cert
+/usr/lib/nagios/plugins/check_configtool
+/usr/lib/nagios/plugins/check_md_raid

diff --git a/debian/nagios-plugins-local-server.install b/debian/nagios-plugins-local-server.install
new file mode 100644 (file)
index 0000000..b4276fd
--- /dev/null
+++ b/debian/nagios-plugins-local-server.install
@@ -0,0 +1,3 @@
+/usr/lib/nagios/plugins/check_krb5
+/usr/lib/nagios/plugins/check_networkclients
+/usr/lib/nagios/plugins/check_ldaps_ip