[Pkg-nagios-changes] [icinga] 05/05: Implement initial support for the cgi/cgi-bin split

[Alexander Wirt]

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

formorer pushed a commit to branch master
in repository icinga.

commit 469b5736a6aa69e66d65fd312cef3257b98e1370
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Mar 15 14:36:56 2014 +0100

    Implement initial support for the cgi/cgi-bin split
---
 debian/control                                     | 29 +++++++++++++++++++++-
 debian/{icinga-cgi.dirs => icinga-cgi-bin.dirs}    |  0
 .../{icinga-cgi.install => icinga-cgi-bin.install} |  2 --
 debian/icinga-cgi.install                          |  8 ------
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 44ba9f4..8676b69 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,7 @@ Architecture: any
 Depends: adduser,
          apache2-utils,
          coreutils (>= 4.5.3),
+         icinga-cgi-bin (= ${binary:Version}),
          icinga-common (= ${source:Version}),
          libjs-jquery (>= 1.4.2-1~),
          libjs-jquery-ui (>= 1.10.1+dfsg-1~),
@@ -75,7 +76,33 @@ Description: host and network monitoring system - CGI scripts
   * web output: current status, notifications, problem history, log
     file, etc.
  .
- This package provides CGI script files.
+ This package provides CGI configuration files and the required dependencys.
+
+Package: icinga-cgi-bin
+Architecture: any
+Replaces: icinga-cgi (<< 1.11.0-2),
+Breaks: icinga-cgi (<< 1.11.0-2),
+Depends: ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends}
+Recommends: apache2 | httpd, nagios-images (>> 0.1)
+Description: host and network monitoring system - CGI scripts
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+  * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+    TCP port
+  * plugin interface to allow for user-developed service checks
+  * contact notifications when problems occur and get resolved (via
+    email, pager, or user-defined method)
+  * support for proactive problem resolution (handlers can be defined to
+    be run during service or host events)
+  * web output: current status, notifications, problem history, log
+    file, etc.
+ .
+ This package provides CGI binarys and HTML files.
 
 Package: icinga-idoutils
 Architecture: any
diff --git a/debian/icinga-cgi.dirs b/debian/icinga-cgi-bin.dirs
similarity index 100%
rename from debian/icinga-cgi.dirs
rename to debian/icinga-cgi-bin.dirs
diff --git a/debian/icinga-cgi.install b/debian/icinga-cgi-bin.install
similarity index 79%
copy from debian/icinga-cgi.install
copy to debian/icinga-cgi-bin.install
index bf0201c..69f2cef 100644
--- a/debian/icinga-cgi.install
+++ b/debian/icinga-cgi-bin.install
@@ -1,4 +1,3 @@
-debian-configs/cgi.cfg /etc/icinga
 usr/lib/cgi-bin/*
 usr/share/icinga/htdocs/*.html
 usr/share/icinga/htdocs/jquery-ui-addon
@@ -7,4 +6,3 @@ usr/share/icinga/htdocs/js/*
 usr/share/icinga/htdocs/media
 usr/share/icinga/htdocs/robots.txt
 usr/share/icinga/htdocs/stylesheets/* /etc/icinga/stylesheets/
-debian/apache2.conf /usr/share/icinga
diff --git a/debian/icinga-cgi.install b/debian/icinga-cgi.install
index bf0201c..1b4e180 100644
--- a/debian/icinga-cgi.install
+++ b/debian/icinga-cgi.install
@@ -1,10 +1,2 @@
 debian-configs/cgi.cfg /etc/icinga
-usr/lib/cgi-bin/*
-usr/share/icinga/htdocs/*.html
-usr/share/icinga/htdocs/jquery-ui-addon
-usr/share/icinga/htdocs/images
-usr/share/icinga/htdocs/js/*
-usr/share/icinga/htdocs/media
-usr/share/icinga/htdocs/robots.txt
-usr/share/icinga/htdocs/stylesheets/* /etc/icinga/stylesheets/
 debian/apache2.conf /usr/share/icinga

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