[Pkg-nagios-changes] [pkg-nagios] r47 - nagios2/trunk/debian

[Marc Haber]

Author: zugschlus
Date: 2006-01-19 19:07:06 +0000 (Thu, 19 Jan 2006)
New Revision: 47

Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/control
   nagios2/trunk/debian/rules
Log:
introduce nagios2-doc


Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-01-19 19:06:21 UTC (rev 46)
+++ nagios2/trunk/debian/changelog	2006-01-19 19:07:06 UTC (rev 47)
@@ -3,8 +3,9 @@
   * NOT RELEASED YET
   * remove boilerplate instructions from README.Debian
   * move debian/copyright to the right place
+  * introduce nagios2-doc and populate it
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Thu, 19 Jan 2006 19:05:33 +0000
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Thu, 19 Jan 2006 19:06:30 +0000
 
 nagios2 (0rc2-2.0-0) experimental; urgency=low
 

Modified: nagios2/trunk/debian/control
===================================================================
--- nagios2/trunk/debian/control	2006-01-19 19:06:21 UTC (rev 46)
+++ nagios2/trunk/debian/control	2006-01-19 19:07:06 UTC (rev 47)
@@ -8,13 +8,13 @@
 
 Package: nagios2-common
 Architecture: all
-Depends: nagios-plugins-basic, coreutils (>= 4.5.3), apache2 | httpd, mailx, adduser, lsb-base (>= 3.0-3), ucf, ${misc:Depends}
+Depends: nagios-plugins-basic, nagios-doc, coreutils (>= 4.5.3), apache2 | httpd, mailx, adduser, lsb-base (>= 3.0-3), ucf, ${misc:Depends}
 Recommends: nagios-plugins, nagios-images
-Description: A host/service/network monitoring and management system
- Contains the common files for the nagios2 package.
+Description: support files for nagios2
+ Nagios is a monitoring and management system for hosts, services and
+ networks. nagios2-common contains the common files for the nagios2 package.
  .
- Nagios is a host/service/network monitoring and management system. It has
- the following features: 
+ Nagios' features include:
  .
  o  Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
     PING, etc.) 
@@ -30,7 +30,7 @@
  This package is the new version 2.x series of nagios, which will eventually
  replace the 1.x versions.
  .
- Nagios is a replacement of the Netsaint project. It accept and uses the
+ Nagios is a replacement of the Netsaint project. It accepts and uses the
  previous Netsaint modules transparently.
  .
  Upstream URL: http://www.nagios.org/
@@ -40,9 +40,11 @@
 Depends: ${shlibs:Depends}, nagios2-common (= ${Source-Version})
 Suggests: nagios-nrpe-plugin
 Description: A host/service/network monitoring and management system
- Nagios is a host/service/network monitoring and management system. It has
- the following features: 
+ Nagios is a monitoring and management system for hosts, services and
+ networks.
  .
+ Nagios' features include:
+ .
  o  Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
     PING, etc.) 
  o  Plugin interface to allow for user-developed service checks 
@@ -62,3 +64,32 @@
  previous Netsaint modules transparently.
  .
  Upstream URL: http://www.nagios.org/
+
+Package: nagios2-doc
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: documentation for nagios2
+ Nagios is a monitoring and management system for hosts, services and
+ networks.
+ .
+ Nagios' features include:
+ .
+ o  Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
+    PING, etc.) 
+ o  Plugin interface to allow for user-developed service checks 
+ o  Contact notifications when problems occur and get resolved (via email,
+    pager, or user-defined method) 
+ o  Ability to define event handlers to be run during service or host events
+    (for proactive problem resolution) 
+ o  Web output (current status, notifications, problem history, log file, etc.) 
+ .
+ Nagios was written in C and is designed to be easy to understand and modify
+ to fit your own needs.
+ .
+ This package is the new version 2.x series of nagios, which will eventually
+ replace the 1.x versions.
+ .
+ Nagios is a replacement of the Netsaint project. It accept and uses the
+ previous Netsaint modules transparently.
+ .
+ Upstream URL: http://www.nagios.org/

Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules	2006-01-19 19:06:21 UTC (rev 46)
+++ nagios2/trunk/debian/rules	2006-01-19 19:07:06 UTC (rev 47)
@@ -7,6 +7,7 @@
 
 b := $(shell pwd)/debian
 bnc := $b/nagios2-common
+bnd := $b/nagios2-doc
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -123,8 +124,9 @@
 	dh_installdirs -a -i
 	# zero out INSTALL_OPTS to prevent chowning at build-time
 	make install DESTDIR=$b/nagios2 INSTALL_OPTS=""
-	# move some arch-indep stuff to the nagios2-common package
-	cp -a $b/nagios2/usr/share/nagios2 ${bnc}/usr/share/
+	# move some arch-indep stuff to the other packages package
+	cp -a $b/nagios2/usr/share/nagios2/debian ${bnc}/usr/share/nagios2/
+	cp -a $b/nagios2/usr/share/nagios2/htdocs ${bnd}/usr/share/nagios2/
 	rm -rf $b/nagios2/usr/share/nagios2
 	# remove empty directory
 	rmdir --ignore-fail-on-non-empty -p $b/nagios2/var/lib/nagios2/archives