Commit 935827eb authored by Michael Friedrich's avatar Michael Friedrich
Browse files

Merge branch 'master' into release

parents c78a1bc5 151d75c3
icinga2 (2.9.0-1) icinga-jessie; urgency=medium
* Update to 2.9.0
-- Michael Friedrich <michael.friedrich@icinga.com> Tue, 17 Jul 2018 12:51:46 +0000
icinga2 (2.8.4-1) icinga-jessie; urgency=medium
* Update to 2.8.4
......
......@@ -25,7 +25,6 @@ Build-Depends: bash-completion,
libssl-dev,
libyajl-dev,
libedit-dev,
libwxgtk3.0-dev,
make (>= 3.81),
po-debconf
Standards-Version: 3.9.8
......@@ -39,7 +38,7 @@ Depends: icinga2-bin (= ${binary:Version}),
icinga2-common (= ${source:Version}),
${misc:Depends}
Recommends: icinga2-doc (= ${binary:Version}), monitoring-plugins-basic | nagios-plugins-basic, libreadline6
Suggests: icinga2-studio, vim-icinga2
Suggests: vim-icinga2
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
......@@ -277,32 +276,7 @@ Description: host and network monitoring system - internal libraries
* 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.
This package provides internal libraries for the daemon.
Package: vim-icinga2
Architecture: all
......
# this is actually a defined word in the livestatus protocol...
spelling-error-in-binary usr/lib/*/icinga2/liblivestatus.so childs children
spelling-error-in-binary usr/lib/*/icinga2/sbin/icinga2 childs children
lib/db_ido_mysql/schema/*.sql usr/share/icinga2-ido-mysql/schema
debian/ido-mysql.conf-sample usr/share/icinga2/tmpl
usr/lib/*/icinga2/libdb_ido_mysql*
usr/lib/*/icinga2/libmysql_shim*
lib/db_ido_mysql/schema/upgrade/*.sql usr/share/icinga2-ido-mysql/schema/upgrade
lib/db_ido_pgsql/schema/*.sql usr/share/icinga2-ido-pgsql/schema
debian/ido-pgsql.conf-sample usr/share/icinga2/tmpl
usr/lib/*/icinga2/libdb_ido_pgsql*
usr/lib/*/icinga2/libpgsql_shim*
lib/db_ido_pgsql/schema/upgrade/*.sql usr/share/icinga2-ido-pgsql/schema/upgrade
[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;
usr/bin/icinga-studio
icinga-studio/icinga.ico /usr/share/icinga2-studio
debian/icinga2-studio.desktop /usr/share/applications
......@@ -2,19 +2,24 @@
#export DH_VERBOSE=1
LTO_BUILD = -DICINGA2_LTO_BUILD=On
DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
# disable unity builds for arches with low memory
# disable unity/lto builds for arches with low memory
ifneq ($(findstring $(DEB_HOST_ARCH), armhf),)
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
LTO_BUILD = -DICINGA2_LTO_BUILD=Off
endif
ifneq ($(findstring $(DEB_HOST_ARCH), mips),)
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
LTO_BUILD = -DICINGA2_LTO_BUILD=Off
endif
ifneq ($(findstring $(DEB_HOST_ARCH), mipsel),)
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
LTO_BUILD = -DICINGA2_LTO_BUILD=Off
endif
%:
......@@ -44,7 +49,8 @@ override_dh_auto_configure:
-DICINGA2_GIT_VERSION_INFO=false \
-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
-DICINGA2_WITH_STUDIO=true \
$(UNITY_BUILD)
$(UNITY_BUILD) \
$(LTO_BUILD)
override_dh_auto_install:
dh_auto_install
......@@ -58,7 +64,7 @@ override_dh_install-indep:
override_dh_install-arch:
dh_install -a
rm debian/libicinga2/usr/lib/*/icinga2/libdb_ido_*
rm debian/libicinga2/usr/lib/*/icinga2/lib*_shim*
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; \
......
icinga2 (2.9.0-1) icinga-stretch; urgency=medium
* Update to 2.9.0
-- Michael Friedrich <michael.friedrich@icinga.com> Tue, 17 Jul 2018 12:51:46 +0000
icinga2 (2.8.4-1) icinga-stretch; urgency=medium
* Update to 2.8.4
......
......@@ -25,7 +25,6 @@ Build-Depends: bash-completion,
libssl-dev,
libyajl-dev,
libedit-dev,
libwxgtk3.0-dev,
make (>= 3.81),
po-debconf
Standards-Version: 3.9.8
......@@ -39,7 +38,7 @@ Depends: icinga2-bin (= ${binary:Version}),
icinga2-common (= ${source:Version}),
${misc:Depends}
Recommends: icinga2-doc (= ${binary:Version}), monitoring-plugins-basic | nagios-plugins-basic, libreadline6
Suggests: icinga2-studio, vim-icinga2
Suggests: vim-icinga2
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
......@@ -277,32 +276,7 @@ Description: host and network monitoring system - internal libraries
* 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.
This package provides internal libraries for the daemon.
Package: vim-icinga2
Architecture: all
......
# this is actually a defined word in the livestatus protocol...
spelling-error-in-binary usr/lib/*/icinga2/liblivestatus.so childs children
spelling-error-in-binary usr/lib/*/icinga2/sbin/icinga2 childs children
lib/db_ido_mysql/schema/*.sql usr/share/icinga2-ido-mysql/schema
debian/ido-mysql.conf-sample usr/share/icinga2/tmpl
usr/lib/*/icinga2/libdb_ido_mysql*
usr/lib/*/icinga2/libmysql_shim*
lib/db_ido_mysql/schema/upgrade/*.sql usr/share/icinga2-ido-mysql/schema/upgrade
lib/db_ido_pgsql/schema/*.sql usr/share/icinga2-ido-pgsql/schema
debian/ido-pgsql.conf-sample usr/share/icinga2/tmpl
usr/lib/*/icinga2/libdb_ido_pgsql*
usr/lib/*/icinga2/libpgsql_shim*
lib/db_ido_pgsql/schema/upgrade/*.sql usr/share/icinga2-ido-pgsql/schema/upgrade
[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;
usr/bin/icinga-studio
icinga-studio/icinga.ico /usr/share/icinga2-studio
debian/icinga2-studio.desktop /usr/share/applications
......@@ -2,19 +2,24 @@
#export DH_VERBOSE=1
LTO_BUILD = -DICINGA2_LTO_BUILD=On
DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
# disable unity builds for arches with low memory
# disable unity/lto builds for arches with low memory
ifneq ($(findstring $(DEB_HOST_ARCH), armhf),)
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
LTO_BUILD = -DICINGA2_LTO_BUILD=Off
endif
ifneq ($(findstring $(DEB_HOST_ARCH), mips),)
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
LTO_BUILD = -DICINGA2_LTO_BUILD=Off
endif
ifneq ($(findstring $(DEB_HOST_ARCH), mipsel),)
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
LTO_BUILD = -DICINGA2_LTO_BUILD=Off
endif
......@@ -46,7 +51,8 @@ override_dh_auto_configure:
-DICINGA2_GIT_VERSION_INFO=false \
-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
-DICINGA2_WITH_STUDIO=true \
$(UNITY_BUILD)
$(UNITY_BUILD) \
$(LTO_BUILD)
override_dh_auto_install:
dh_auto_install
......@@ -60,7 +66,7 @@ override_dh_install-indep:
override_dh_install-arch:
dh_install -a
rm debian/libicinga2/usr/lib/*/icinga2/libdb_ido_*
rm debian/libicinga2/usr/lib/*/icinga2/lib*_shim*
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; \
......
icinga2 (2.9.0-1) icinga-ubuntu; urgency=medium
* Update to 2.9.0
-- Michael Friedrich <michael.friedrich@icinga.com> Tue, 17 Jul 2018 12:51:46 +0000
icinga2 (2.8.4-1) icinga-ubuntu; urgency=medium
* Update to 2.8.4
......
......@@ -27,7 +27,6 @@ Build-Depends: bash-completion,
libssl-dev,
libyajl-dev,
libedit-dev,
libwxgtk3.0-dev,
make (>= 3.81),
po-debconf
Standards-Version: 3.9.8
......@@ -41,7 +40,7 @@ Depends: icinga2-bin (= ${binary:Version}),
icinga2-common (= ${source:Version}),
${misc:Depends}
Recommends: icinga2-doc (= ${binary:Version}), monitoring-plugins-basic | nagios-plugins-basic, libreadline6
Suggests: icinga2-studio, vim-icinga2
Suggests: vim-icinga2
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
......@@ -279,32 +278,7 @@ Description: host and network monitoring system - internal libraries
* 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.
This package provides internal libraries for the daemon.
Package: vim-icinga2
Architecture: all
......
# this is actually a defined word in the livestatus protocol...
spelling-error-in-binary usr/lib/*/icinga2/liblivestatus.so childs children
spelling-error-in-binary usr/lib/*/icinga2/sbin/icinga2 childs children
lib/db_ido_mysql/schema/*.sql usr/share/icinga2-ido-mysql/schema
debian/ido-mysql.conf-sample usr/share/icinga2/tmpl
usr/lib/*/icinga2/libdb_ido_mysql*
usr/lib/*/icinga2/libmysql_shim*
lib/db_ido_mysql/schema/upgrade/*.sql usr/share/icinga2-ido-mysql/schema/upgrade
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment