Branches for Edgy

Author: Martin Pitt
Revision Date: 2006-07-03 08:28:46 UTC

* Merge to Debian unstable; remaining Ubuntu changes:
  - debian/nagios-common.config: Use Apache2 by default.
  - debian/nagios-common.nagios.init: Create /var/run/nagios with the right
    permissions.
* debian/control: Prefer apache2 as web server (not apache).
* Drop dbconfig-common from Depends: to Suggests: and enclose all the
  invocations of it in {my,pg}sql.{config,postinst,prerm,postrm} in a test
  whether it is installed. dbconfig-common is currently in universe and
  considered too crackful, and it does not even work OOTB (tested with the
  PostgreSQL module).