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

[Sean Finney]

Author: seanius
Date: 2006-01-15 00:57:26 +0000 (Sun, 15 Jan 2006)
New Revision: 39

Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/control
   nagios2/trunk/debian/nagios2-common.nagios2.init
   nagios2/trunk/debian/rules
Log:
some hopefully final changes for the nagios vs. nagios2 issue,
as well as updating to use rc2, which came out last tuesday.


Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-01-14 16:36:23 UTC (rev 38)
+++ nagios2/trunk/debian/changelog	2006-01-15 00:57:26 UTC (rev 39)
@@ -1,6 +1,19 @@
-nagios2 (0rc1-2.0-0) experimental; urgency=low
+nagios2 (0rc2-2.0-0) experimental; urgency=low
 
+  * this version is targeted as a prelease candidate for experimental.
+
   [sean finney]
+  * update to upstream rc2
+  * after the change of course on the nagios vs nagios2 issue, a few
+    (hopefully) final naming changes were made in the build process.
+  * updated dependencies to reflect that nagios2 does not conflict
+    with nagios 1.x.
+
+ -- sean finney <seanius at debian.org>  Sun, 15 Jan 2006 01:55:14 +0100
+
+nagios2 (0rc1-2.0-0) unreleased; urgency=low
+
+  [sean finney]
   * initial version (closes: #341748).  until nagios2 officially releases,
     we'll use the 0$rcfoo-$version numbering scheme so that we never find
     ourselves stuck needing to muck with the epoch.

Modified: nagios2/trunk/debian/control
===================================================================
--- nagios2/trunk/debian/control	2006-01-14 16:36:23 UTC (rev 38)
+++ nagios2/trunk/debian/control	2006-01-15 00:57:26 UTC (rev 39)
@@ -9,9 +9,7 @@
 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}
-Recommends: nagios-plugins
-Conflicts: nagios-mysql, nagios-pgsql, nagios-common
-Replaces: nagios, nagios-common
+Recommends: nagios-plugins, nagios-images
 Description: A host/service/network monitoring and management system
  Contains the common files for the nagios2 package.
  .
@@ -40,11 +38,7 @@
 Package: nagios2
 Architecture: any
 Depends: ${shlibs:Depends}, nagios2-common (= ${Source-Version})
-Recommends: nagios-images
 Suggests: nagios-nrpe-plugin
-Conflicts: nagios, nagios-text, nagios-pgsql, nagios-mysql
-Replaces: nagios, nagios-text, nagios-pgsql, nagios-mysql
-Provides: nagios, nagios-text
 Description: A host/service/network monitoring and management system
  Nagios is a host/service/network monitoring and management system. It has
  the following features: 

Modified: nagios2/trunk/debian/nagios2-common.nagios2.init
===================================================================
--- nagios2/trunk/debian/nagios2-common.nagios2.init	2006-01-14 16:36:23 UTC (rev 38)
+++ nagios2/trunk/debian/nagios2-common.nagios2.init	2006-01-15 00:57:26 UTC (rev 39)
@@ -7,9 +7,9 @@
 #		nagios2 version by Marc Haber <mh+debian-packages at zugschlus.de>
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/nagios
-NAME="nagios"
-DESC="nagios2 daemon"
+DAEMON=/usr/sbin/nagios2
+NAME="nagios2"
+DESC="nagios2 monitoring daemon"
 NAGIOSCFG="/etc/nagios2/nagios.cfg"
 CGICFG="/etc/nagios2/cgi.cfg"
 NICENESS=5

Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules	2006-01-14 16:36:23 UTC (rev 38)
+++ nagios2/trunk/debian/rules	2006-01-15 00:57:26 UTC (rev 39)
@@ -131,6 +131,9 @@
 	# set up /var/cache/nagios2 for access by www-data
 	chgrp www-data ${bnc}/var/cache/nagios2
 	chmod g+s ${bnc}/var/cache/nagios2
+	# alter some installed filenames
+	mv ${b}/nagios2/usr/sbin/nagios ${b}/nagios2/usr/sbin/nagios2
+	mv ${b}/nagios2/usr/sbin/nagiostats ${b}/nagios2/usr/sbin/nagios2tats
 	dh_installdocs       -i
 	dh_installchangelogs -i
 	dh_install           -i