[Pkg-nagios-changes] [pkg-nagios] r858 - nagios-nrpe/trunk/debian

[Sean Finney]

Author: seanius
Date: 2006-03-13 14:35:01 +0000 (Mon, 13 Mar 2006)
New Revision: 858

Removed:
   nagios-nrpe/trunk/debian/nagios-nrpe-doc.docs
Modified:
   nagios-nrpe/trunk/debian/changelog
   nagios-nrpe/trunk/debian/control
   nagios-nrpe/trunk/debian/docs
   nagios-nrpe/trunk/debian/rules
Log:
remove nagios-nrpe-doc

Modified: nagios-nrpe/trunk/debian/changelog
===================================================================
--- nagios-nrpe/trunk/debian/changelog	2006-03-13 13:51:12 UTC (rev 857)
+++ nagios-nrpe/trunk/debian/changelog	2006-03-13 14:35:01 UTC (rev 858)
@@ -14,6 +14,10 @@
   * check_nrpe -h provides what "-a" does, but i've gone ahead and
     added a comment in check_nrpe.cfg too, because it can't hurt
     to do so :) (closes: #351714).
+  * no longer generate the nagios-nrpe-doc package, and move copies of
+    the documentation into the plugin and server packages.  add a
+    Conflicts: nagios-nrpe-doc to the remaining packages to ensure
+    that the stale package doesn't remain.
 
  -- sean finney <seanius at debian.org>  Tue, 24 Jan 2006 18:16:54 +0100
 

Modified: nagios-nrpe/trunk/debian/control
===================================================================
--- nagios-nrpe/trunk/debian/control	2006-03-13 13:51:12 UTC (rev 857)
+++ nagios-nrpe/trunk/debian/control	2006-03-13 14:35:01 UTC (rev 858)
@@ -9,6 +9,7 @@
 Package: nagios-nrpe-server
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: nagios-nrpe-doc
 Recommends: nagios-plugins | nagios-plugins-basic
 Description: Nagios Remote Plugin Exectutor Server
  Nagios is a host/service/network monitoring and management system.
@@ -22,6 +23,7 @@
 Package: nagios-nrpe-plugin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: nagios-nrpe-doc
 Recommends: nagios
 Description: Nagios Remote Plugin Exectutor Plugin
  Nagios is a host/service/network monitoring and management system.
@@ -32,10 +34,3 @@
  This is a plugin that is run on the Nagios host and is used to contact the
  NRPE process on remote hosts.
 
-Package: nagios-nrpe-doc
-Architecture: all
-Description: Documentation for nagios-nrpe
- Nagios is a host/service/network monitoring and management system.
- .
- The purpose of this addon is to allow you to execute Nagios plugins on a
- remote host in as transparent a manner as possible.

Modified: nagios-nrpe/trunk/debian/docs
===================================================================
--- nagios-nrpe/trunk/debian/docs	2006-03-13 13:51:12 UTC (rev 857)
+++ nagios-nrpe/trunk/debian/docs	2006-03-13 14:35:01 UTC (rev 858)
@@ -1,2 +1,4 @@
 README
 README.SSL
+LEGAL
+SECURITY

Deleted: nagios-nrpe/trunk/debian/nagios-nrpe-doc.docs
===================================================================
--- nagios-nrpe/trunk/debian/nagios-nrpe-doc.docs	2006-03-13 13:51:12 UTC (rev 857)
+++ nagios-nrpe/trunk/debian/nagios-nrpe-doc.docs	2006-03-13 14:35:01 UTC (rev 858)
@@ -1,3 +0,0 @@
-LEGAL
-README.SSL
-SECURITY

Modified: nagios-nrpe/trunk/debian/rules
===================================================================
--- nagios-nrpe/trunk/debian/rules	2006-03-13 13:51:12 UTC (rev 857)
+++ nagios-nrpe/trunk/debian/rules	2006-03-13 14:35:01 UTC (rev 858)
@@ -38,7 +38,7 @@
 	dh_installdebconf
 	dh_installdirs
 	dh_installchangelogs Changelog
-	dh_installdocs README
+	dh_installdocs -A
 	dh_installexamples
 	dh_installinit -u defaults 30
 	dh_installman