[Pkg-nagios-changes] [pkg-pnp4nagios] 01/04: Merge remote-tracking branch 'remotes/origin/experimental'

[Bernd Zeimetz]

This is an automated email from the git hooks/post-receive script.

bzed pushed a commit to branch master
in repository pkg-pnp4nagios.

commit cc8565a51cddadf4210119b9e81749d669e3b4dd
Merge: 009534c 42f255b
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Mon Aug 26 13:19:42 2013 +0200

    Merge remote-tracking branch 'remotes/origin/experimental'

 debian/changelog                    |   42 +++++++++++++++++++++++++++++++++--
 debian/control                      |   36 +++++++++++-------------------
 debian/copyright                    |    9 ++++----
 debian/icinga-module.cfg            |   11 +++++++++
 debian/nagios.cfg                   |    8 +++----
 debian/patches/adjust-template-path |    9 +++++---
 debian/patches/fix-npcd-path        |    2 +-
 debian/patches/format-security      |   18 +++++++++++++++
 debian/patches/series               |    1 +
 debian/pnp4nagios-bin.postinst      |    2 ++
 debian/rules                        |    9 +++++++-
 11 files changed, 109 insertions(+), 38 deletions(-)

diff --cc debian/control
index 24fe263,5836832..d063cde
--- a/debian/control
+++ b/debian/control
@@@ -47,56 -40,15 +40,53 @@@ Description: Nagios addon to create gra
   .
   This package contains the NPCD-related binaries and process_perfdata.pl.
  
 +Package: pnp4nagios-web-config-icinga
 +Architecture: any
 +Depends: ${misc:Depends},
 +         ${shlibs:Depends}
 +Conflicts: pnp4nagios-web-config-nagios3
 +Replaces: pnp4nagios-web
 +Description: Nagios addon to create graphs from performance data (binaries)
 + PNP is a graphing tool for Nagios that analyzes performance data provided by
 + plugins and stores them automatically into Round Robin Databases (RRD). It
 + fully integrates itself into the Nagios Monitoring Website.
 + .
 + PNP's goal is to be easily configurable and maintainable. It supports several
 + modes of operation. When using the Gearman mode, some additional Perl modules
 + are required: Gearman::Worker, MIME::Base64, and Crypt::Rijndael which are
 + available in the libgearman-client-perl, perl, and libcrypt-rijndael-perl
 + packages.
 + .
 + This package contains the icinga specific configuration for pnp4nagios-web.
 +
 +Package: pnp4nagios-web-config-nagios3
 +Architecture: any
 +Depends: ${misc:Depends},
 +         ${shlibs:Depends}
 +Conflicts: pnp4nagios-web-config-icinga
 +Replaces: pnp4nagios-web
 +Description: Nagios addon to create graphs from performance data (binaries)
 + PNP is a graphing tool for Nagios that analyzes performance data provided by
 + plugins and stores them automatically into Round Robin Databases (RRD). It
 + fully integrates itself into the Nagios Monitoring Website.
 + .
 + PNP's goal is to be easily configurable and maintainable. It supports several
 + modes of operation. When using the Gearman mode, some additional Perl modules
 + are required: Gearman::Worker, MIME::Base64, and Crypt::Rijndael which are
 + available in the libgearman-client-perl, perl, and libcrypt-rijndael-perl
 + packages.
 + .
 + This package contains the nagios3 specific configuration for pnp4nagios-web.
 +
  Package: pnp4nagios-web
  Architecture: all
- Depends: adduser,
-          pnp4nagios-web-config-nagios3 | pnp4nagios-web-config-icinga,
-          libapache2-mod-php5 | php5-cgi | php5,
-          libfpdi-php,
-          libjs-jquery (>= 1.6.2),
-          libjs-jquery-ui (>= 1.8.14),
-          libkohana2-php,
-          php5-gd,
-          rrdtool,
-          ${misc:Depends}
+ Depends: libapache2-mod-php5 | php5-cgi | php5, php5-gd,
+  libkohana2-php,
+  libfpdi-php,
+  libjs-jquery (>= 1.6.2), libjs-jquery-ui (>= 1.8.ooops.14),
+  rrdtool,
+  adduser,
+  ${misc:Depends}
  Recommends: pnp4nagios-bin
  Suggests: rrdcached
  Description: Nagios addon to create graphs from performance data (web interface)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-pnp4nagios.git