[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. 1.0.1-1-6-g4f40899

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 4f4089905b50117b230079e53faf683c14d9ae9b
Merge: 145def4ed6405e734c99a265a0ec8d54ab81dd24 d4e00badfa03a9f62b272e008b46230d21317681
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Apr 8 17:38:50 2010 +0200

    Merge branch 'master' of alioth.debian.org:/git/pkg-nagios/icinga
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index d92cbaf,3034780..89ee48e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,10 @@@
  icinga (1.0.1-2) unstable; urgency=low
  
 +  * Fix maintainer address
 +  * Disable context sensitive help
+   * Recommend php5-mysql | php5-pgsql for the phpapi package
  
-  -- Alexander Wirt <formorer at debian.org>  Thu, 08 Apr 2010 17:36:08 +0200
+  -- Alexander Wirt <formorer at debian.org>  Wed, 07 Apr 2010 14:31:39 +0200
  
  icinga (1.0.1-1) unstable; urgency=low
  
diff --combined debian/control
index f80520c,843f57b..3829ead
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,7 +1,7 @@@
  Source: icinga
  Section: net
  Priority: optional
 -Maintainer: Debian Icinga Maintainer Group <pkg-icinga-devel at lists.alioth.debian.org>
 +Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
  Uploaders: Alexander Wirt <formorer at debian.org>, Jan Wagner <waja at cyconet.org>
  Standards-Version: 3.8.4
  Build-Depends: debhelper (>= 7), dpatch (>= 2.0.10), po-debconf, libperl-dev,
@@@ -147,7 -147,7 +147,7 @@@ Description: documentation for icing
  
  Package: icinga-phpapi
  Architecture: all
- Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, php5 | php5-cgi | php5-cli | libapache2-mod-php5
+ Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, php5 | php5-cgi | php5-cli | libapache2-mod-php5, php5-mysql | php5-pgsql
  Recommends: icinga-idoutils
  Description: phpapi for icinga
   Icinga is a monitoring and management system for hosts, services and

-- 
debian packaging of icinga(-core)