[Pkg-nagios-changes] [pkg-icinga2] 02/02: Add icinga2-studio package for Icinga 2.4

Thu Nov 5 12:17:00 UTC 2015

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

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

commit 1f2958527f513e03011ab501fb878de784cf3d5a
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Sun Nov 1 20:23:38 2015 +0100

    Add icinga2-studio package for Icinga 2.4
---
 debian/.gitignore             |  1 +
 debian/control                | 56 ++++++++++++++++++++++++++++++++++++++++++-
 debian/icinga2-bin.install    |  2 +-
 debian/icinga2-studio.desktop | 11 +++++++++
 debian/icinga2-studio.install |  3 +++
 debian/icinga2-studio.menu    |  3 +++
 debian/libicinga2.install     |  1 +
 debian/rules                  |  5 ++--
 8 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
index a6cf5dd..14d04dc 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -5,5 +5,6 @@ files
 
 icinga2/
 icinga2-*/
+libicinga2/
 tmp/
 
diff --git a/debian/control b/debian/control
index 987bc1b..4ac273f 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: bison,
                libssl-dev,
                libyajl-dev,
                libedit-dev,
+               libwxgtk3.0-dev,
                make (>= 3.81),
                po-debconf
 Standards-Version: 3.9.6
@@ -35,6 +36,7 @@ Depends: icinga2-bin (= ${binary:Version}),
          icinga2-common (= ${source:Version}),
          ${misc:Depends}
 Recommends: icinga2-doc, monitoring-plugins-basic | nagios-plugins-basic, libreadline6
+Suggests: icinga2-studio
 Description: host and network monitoring system
  Icinga 2 is a general-purpose monitoring application to fit the needs of
  any size of network. Icinga 1.x was a Nagios fork; this new generation
@@ -87,6 +89,7 @@ Package: icinga2-bin
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: icinga2-common (= ${source:Version}),
+         libicinga2 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: host and network monitoring system - daemon
@@ -224,7 +227,9 @@ Description: host and network monitoring system - PostgreSQL support
 Package: icinga2-dbg
 Architecture: any
 Section: debug
-Depends: icinga2-bin (= ${binary:Version}), ${misc:Depends}
+Depends: icinga2-bin (= ${binary:Version}),
+         libicinga2 (= ${binary:Version}),
+         ${misc:Depends}
 Description: host and network monitoring system - debug symbols
  Icinga 2 is a general-purpose monitoring application to fit the needs of
  any size of network. Icinga 1.x was a Nagios fork; this new generation
@@ -243,3 +248,52 @@ Description: host and network monitoring system - debug symbols
   * native support for Livestatus and Graphite.
  .
  This package provides debug symbols for Icinga 2.
+
+Package: libicinga2
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: host and network monitoring system - internal libraries
+ Icinga 2 is a general-purpose monitoring application to fit the needs of
+ any size of network. Icinga 1.x was a Nagios fork; this new generation
+ has been rewritten from scratch in C++, with multi-threading and cluster
+ support.
+ .
+ Features:
+  * all standard features of Icinga and Nagios;
+  * much faster and more scalable than Icinga 1 and Nagios;
+  * new, more intuitive, template-based configuration format;
+  * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
+    SMTP, etc.) by executing checks (see monitoring-plugins*);
+  * any small script following the Nagios plugin API can be used as a
+    check plugin;
+  * notifications about alerts for any custom script (with examples);
+  * native support for Livestatus and Graphite.
+ .
+ This package provides internal libraries for the daemon or studio.
+
+Package: icinga2-studio
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libicinga2 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: host and network monitoring system - studio API GUI
+ Icinga 2 is a general-purpose monitoring application to fit the needs of
+ any size of network. Icinga 1.x was a Nagios fork; this new generation
+ has been rewritten from scratch in C++, with multi-threading and cluster
+ support.
+ .
+ Features:
+  * all standard features of Icinga and Nagios;
+  * much faster and more scalable than Icinga 1 and Nagios;
+  * new, more intuitive, template-based configuration format;
+  * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
+    SMTP, etc.) by executing checks (see monitoring-plugins*);
+  * any small script following the Nagios plugin API can be used as a
+    check plugin;
+  * notifications about alerts for any custom script (with examples);
+  * native support for Livestatus and Graphite.
+ .
+ This package provides a GUI for the Icinga 2 API.
diff --git a/debian/icinga2-bin.install b/debian/icinga2-bin.install
index da8e7bd..7c2c410 100644
--- a/debian/icinga2-bin.install
+++ b/debian/icinga2-bin.install
@@ -1,3 +1,3 @@
-usr/lib/*/icinga2
 usr/sbin/icinga2
+usr/lib/*/icinga2/sbin
 usr/share/man/man8/icinga2.8
diff --git a/debian/icinga2-studio.desktop b/debian/icinga2-studio.desktop
new file mode 100644
index 0000000..05aa4b0
--- /dev/null
+++ b/debian/icinga2-studio.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Icinga 2 Studio
+Comment=API viewer for Icinga 2
+TryExec=icinga-studio
+Exec=icinga-studio
+Icon=/usr/share/icinga2-studio/icinga.ico
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GTK;Utility;
+Keywords=Monitoring;
diff --git a/debian/icinga2-studio.install b/debian/icinga2-studio.install
new file mode 100644
index 0000000..13cb4cc
--- /dev/null
+++ b/debian/icinga2-studio.install
@@ -0,0 +1,3 @@
+usr/bin/icinga-studio
+icinga-studio/icinga.ico /usr/share/icinga2-studio
+debian/icinga2-studio.desktop /usr/share/applications
diff --git a/debian/icinga2-studio.menu b/debian/icinga2-studio.menu
new file mode 100644
index 0000000..57e79c3
--- /dev/null
+++ b/debian/icinga2-studio.menu
@@ -0,0 +1,3 @@
+?package(icinga2-studio):needs="X11|wm" section="Applications/Network"\
+  title="Icinga2 Studio" command="/usr/bin/icinga-studio" \
+  icon="/usr/share/icinga2-studio/icinga.ico"
diff --git a/debian/libicinga2.install b/debian/libicinga2.install
new file mode 100644
index 0000000..450a53b
--- /dev/null
+++ b/debian/libicinga2.install
@@ -0,0 +1 @@
+usr/lib/*/icinga2/*.so
diff --git a/debian/rules b/debian/rules
index 822a5b3..6236ff7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,8 @@ override_dh_auto_configure:
 		-DICINGA2_GROUP=nagios \
 		-DICINGA2_COMMAND_GROUP=www-data \
 		-DICINGA2_GIT_VERSION_INFO=false \
-		-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins
+		-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
+		-DICINGA2_WITH_STUDIO=true
 
 override_dh_auto_install:
 	dh_auto_install
@@ -38,7 +39,7 @@ override_dh_install:
 	if [ -d debian/icinga2-common/ ]; then chmod +x debian/icinga2-common/usr/lib/icinga2/prepare-dirs; fi
 	# remove ido files from other packages
 	if [ -d debian/icinga2-common/ ]; then rm debian/icinga2-common/etc/icinga2/features-available/ido-*; fi
-	rm debian/icinga2-bin/usr/lib/*/icinga2/libdb_ido_*
+	rm debian/libicinga2/usr/lib/*/icinga2/libdb_ido_*
 	for dbms in mysql pgsql; do \
 		mkdir -p debian/icinga2-ido-$$dbms/usr/share/dbconfig-common/data/icinga2-ido-$$dbms/install ; \
 		mkdir -p debian/icinga2-ido-$$dbms/usr/share/dbconfig-common/data/icinga2-ido-$$dbms/upgrade/$$dbms; \

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

