[Pkg-nagios-changes] [SCM] Debian packaging for Nagios3 branch, master, updated. 3.2.1-2-1-g418606f

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 418606f701a645e8e3c1c6a6ad51dbd9dfcc8615
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Oct 2 19:02:09 2010 +0200

    Remove iputils ping from build-dep
    Add index.html to apache2.conf

diff --git a/debian/apache2.conf b/debian/apache2.conf
index a314692..62c2447 100644
--- a/debian/apache2.conf
+++ b/debian/apache2.conf
@@ -30,7 +30,7 @@ Alias /nagios3 /usr/share/nagios3/htdocs
 <DirectoryMatch (/usr/share/nagios3/htdocs|/usr/lib/cgi-bin/nagios3|/etc/nagios3/stylesheets)>
 	Options FollowSymLinks
 
-	DirectoryIndex index.php
+	DirectoryIndex index.php index.html
 
 	AllowOverride AuthConfig
 	Order Allow,Deny
diff --git a/debian/changelog b/debian/changelog
index acd4f7c..7e7bfb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nagios3 (3.2.1-3) unstable; urgency=low
+
+  * Remove iputils-ping from build-dep (Closes: #590552)
+  * Add index.html to apache2.conf (Closes: #598859) 
+
+ -- Alexander Wirt <formorer at debian.org>  Sat, 02 Oct 2010 19:01:32 +0200
+
 nagios3 (3.2.1-2) unstable; urgency=low
 
   * Fix "Missing conflict with nagios3 v3.0.6-4~lenny2 (/usr/lib/cgi-
diff --git a/debian/control b/debian/control
index fca82a0..c4ca6d4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-nagios3.git
 Vcs-Git: git://git.debian.org/pkg-nagios/pkg-nagios3.git
 Standards-Version: 3.9.0
 Build-Depends: debhelper (>= 7), dpatch (>= 2.0.10), po-debconf, libperl-dev,
- libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping,
+ libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1),
  autotools-dev, dpkg-dev (>= 1.13.19)
 
 Package: nagios3-common

-- 
Debian packaging for Nagios3