Merge lp:~niedbalski/ubuntu/wily/nagios3/fix-1469168 into lp:ubuntu/wily/nagios3

[Jorge Niedbalski]

Fixes bug LP: #1469168

[Marc Deslauriers (mdeslaur)]

Looks good, ACK.

Uploaded. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-21 13:15:58 +0000
+++ debian/changelog	2015-06-26 17:43:20 +0000
@@ -1,3 +1,10 @@
+nagios3 (3.5.1-1ubuntu3) UNRELEASED; urgency=medium
+
+  * d/conf.d/*.cfg: Changed the debian references to
+    Ubuntu. (LP: #1469168).
+
+ -- Jorge Niedbalski <[e-mail]>  Fri, 26 Jun 2015 14:35:09 -0300
+
 nagios3 (3.5.1-1ubuntu2) utopic; urgency=medium
 
   * Rebuild for Perl 5.20.0.

=== modified file 'debian/conf.d/extinfo_nagios2.cfg'
--- debian/conf.d/extinfo_nagios2.cfg	2008-04-08 20:39:11 +0000
+++ debian/conf.d/extinfo_nagios2.cfg	2015-06-26 17:43:20 +0000
@@ -3,11 +3,11 @@
 ##
 
 define hostextinfo{
-        hostgroup_name   debian-servers
-        notes            Debian GNU/Linux servers
+        hostgroup_name   ubuntu-servers
+        notes            Ubuntu Linux servers
 #       notes_url        http://webserver.localhost.localdomain/hostinfo.pl?host=netware1
-        icon_image       base/debian.png
-        icon_image_alt   Debian GNU/Linux
-        vrml_image       debian.png
-        statusmap_image  base/debian.gd2
+        icon_image       base/ubuntu.png
+        icon_image_alt   Ubuntu Linux
+        vrml_image       ubuntu.png
+        statusmap_image  base/ubuntu.gd2
         }

=== modified file 'debian/conf.d/hostgroups_nagios2.cfg'
--- debian/conf.d/hostgroups_nagios2.cfg	2010-04-12 21:36:13 +0000
+++ debian/conf.d/hostgroups_nagios2.cfg	2015-06-26 17:43:20 +0000
@@ -7,10 +7,10 @@
 		members         *
         }
 
-# A list of your Debian GNU/Linux servers
+# A list of your Ubuntu Linux servers
 define hostgroup {
-        hostgroup_name  debian-servers
-		alias           Debian GNU/Linux Servers
+        hostgroup_name  ubuntu-servers
+		alias           Ubuntu Linux Servers
 		members         localhost
         }