[Pkg-nagios-changes] [pkg-icinga2] 02/08: Added python-icinga2 and updates for list-objects

[Markus Frosch]

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

lazyfrosch pushed a commit to branch master
in repository pkg-icinga2.

commit 4e08221027ea72c6321eadb97ac2e1d3757d8e54
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Fri Aug 29 11:45:49 2014 +0200

    Added python-icinga2 and updates for list-objects
    
    Authored originally by Gunnar Beutner <gunnar.beutner at netways.de>
---
 debian/control                | 31 +++++++++++++++++++++++++++++--
 debian/copyright              |  2 +-
 debian/icinga2-common.install |  1 +
 debian/python-icinga2.install |  1 +
 debian/rules                  |  6 ++++--
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 9ec474f..da0dc96 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,9 @@ Build-Depends: bison,
                libpq-dev,
                libssl-dev,
                make (>= 3.81),
-               po-debconf
+               po-debconf,
+               python-setuptools,
+               python-all
 Standards-Version: 3.9.5
 Homepage: http://www.icinga.org
 Vcs-Browser: http://anonscm.debian.org/anonscm/git/pkg-nagios/pkg-icinga2.git
@@ -54,7 +56,7 @@ Description: host and network monitoring system
 
 Package: icinga2-common
 Architecture: all
-Depends: adduser, lsb-release, ${misc:Depends}
+Depends: python-icinga2 (= ${source:Version}), adduser, lsb-release, ${misc:Depends}
 Description: host and network monitoring system - common files
  Icinga 2 is a general-purpose monitoring application and the next generation
  after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small
@@ -240,3 +242,28 @@ Description: host and network monitoring system - debug symbols
   * Native support for Livestatus and Graphite
  .
  This package provides debug symbols for Icinga 2.
+
+Package: python-icinga2
+Architecture: all
+Section: python
+Priority: extra
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
+Description: host and network monitoring system - Python module
+ Icinga 2 is a general-purpose monitoring application and the next generation
+ after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small
+ environment as well as big installations.
+ .
+ Rewritten from scratch in C++, with multi-threading and cluster support.
+ .
+ Features:
+  * All common features of Icinga and Nagios
+  * Much faster and more scalable than Icinga 1 and Nagios
+  * New configuration format, more intuitive and template based
+  * Monitoring several services by executing checks (see nagios-plugins*)
+    for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port
+  * Any small script can be used as a check plugin, when following the Nagios
+    plugin API
+  * Notifications about alerts with any custom script, or shipped examples
+  * Native support for Livestatus and Graphite
+ .
+ This package provides the Python module for Icinga 2.
diff --git a/debian/copyright b/debian/copyright
index d4fd204..aa314c7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: http://www.icinga.org
 
 Files: *
 Copyright: 2012-2014 Icinga Development Team (http://www.icinga.org)
-License: GPL-2+-with-exeception
+License: GPL-2+-with-exception
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
diff --git a/debian/icinga2-common.install b/debian/icinga2-common.install
index a97e0a8..f4f8e26 100644
--- a/debian/icinga2-common.install
+++ b/debian/icinga2-common.install
@@ -5,4 +5,5 @@ tools/syntax/* 		      usr/share/icinga2-common/syntax
 usr/bin/icinga2-build*
 usr/bin/icinga2-sign-key
 usr/sbin/icinga2-*-feature
+usr/sbin/icinga2-list-objects
 usr/share/icinga2
diff --git a/debian/python-icinga2.install b/debian/python-icinga2.install
new file mode 100644
index 0000000..2453ce7
--- /dev/null
+++ b/debian/python-icinga2.install
@@ -0,0 +1 @@
+usr/lib/python*/
diff --git a/debian/rules b/debian/rules
index 85df480..8e37a82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,17 +3,19 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --with python2
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+		-DICINGA2_RUNDIR=/run \
 		-DICINGA2_USER=nagios \
 		-DICINGA2_GROUP=nagios \
 		-DICINGA2_COMMAND_USER=nagios \
 		-DICINGA2_COMMAND_GROUP=www-data \
-		-DICINGA2_GIT_VERSION_INFO=false
+		-DICINGA2_GIT_VERSION_INFO=false \
+		-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins
 
 override_dh_auto_install:
 	dh_auto_install

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