[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, debmon-squeeze, updated. debian/1.9.1-1_debmon60+1-18-g0b90280
Alexander Wirt
formorer at debian.org
Sun Jul 21 10:05:42 UTC 2013
The following commit has been merged in the debmon-squeeze branch:
commit f980fba5703f632ac637e2db18c8c87f256b1540
Merge: 8b6ebe94500472a360219670d22910733d5bedca e6a53b239651d7ed9ca3715ed17b0cf74640c58f
Author: Alexander Wirt <formorer at debian.org>
Date: Tue May 7 22:08:26 2013 +0200
Merge branch 'master' into debmon-squeeze
Conflicts:
debian/changelog
debian/rules
diff --combined debian/changelog
index b0a662f,38e73a0..946759d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,27 @@@
- icinga (1.8.4-1~debmon60+1) debmon-squeeze; urgency=low
++icinga (1.9.0-1~debmon60+1) debmon-squeeze; urgency=low
+
+ * Rebuild for debmon
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 14 Jan 2013 21:19:09 +0100
+
+ icinga (1.9.0-1) unstable; urgency=low
+
+ * [006e77b] Allow www-data to read those archived logs
+ * [c732717] Don't destroy symlinked icinga configs with sed (Closes: #698137)
+ * [4a63fdf] install jquery-ui
+ * [d905069] Use bundled jquery-ui version
+ * [8110db1] Imported Upstream version 1.9.0
+ - Event profiling is now deprecated (Closes: #614356)
+ * [91e3d0b] Install 1.9.0 sql files
+ * [7d35822] Move stylesheets to cgi (Closes: #682334)
+ * [914bc33] Use debians jquery-ui and fix timepicker locations
+ * [51e1d00] Improve errorhandling in initscript (Closes: #698139)
+ * [0ed174a] Add indonesian debconf translation.
+ Thanks to Mahyuddin Susanto (Closes: #695651)
+ * [bbaa9f6] Recommend icinga-docs in the icinga metapackage (Closes: #682359)
+
+ -- Alexander Wirt <formorer at debian.org> Tue, 07 May 2013 16:18:34 +0200
+
icinga (1.8.4-1) experimental; urgency=high
* [a466a1e] Replace /etc/init.d with service
@@@ -19,12 -31,6 +37,12 @@@ icinga (1.8.3-1) experimental; urgency=
-- Alexander Wirt <formorer at debian.org> Thu, 13 Dec 2012 21:41:33 +0100
+icinga (1.8.2-1~debmon60+1) debmon-squeeze; urgency=low
+
+ * Rebuild for debmon
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 28 Nov 2012 18:00:38 +0100
+
icinga (1.8.2-1) experimental; urgency=low
* [868de52] Imported Upstream version 1.8.2
@@@ -38,18 -44,6 +56,18 @@@ icinga (1.8.1-2) experimental; urgency=
-- Alexander Wirt <formorer at debian.org> Sun, 04 Nov 2012 21:57:50 +0100
+icinga (1.8.1-1~debmon60+2) debmon-squeeze; urgency=low
+
+ * [f9c35cb] Fix sql script version, otherwise it get applied twice which fails
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 25 Oct 2012 15:13:24 +0200
+
+icinga (1.8.1-1~debmon60+1) debmon-squeeze; urgency=low
+
+ * Rebuild for debmon-squeeze
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 25 Oct 2012 07:23:52 +0200
+
icinga (1.8.1-1) experimental; urgency=low
* [5947e03] Remove useless echo in do_stop of icingas initscript
@@@ -57,14 -51,6 +75,14 @@@
-- Alexander Wirt <formorer at debian.org> Thu, 25 Oct 2012 07:04:55 +0200
+icinga (1.8.0-1~debmon60+1) debmon-squeeze; urgency=low
+
+ * [888d92e] Add gbp.conf
+ * [8e19039] Replace --status with --test in ido2dbs initscript
+ * [9c53523] Fix gbp config
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 19 Oct 2012 17:04:48 +0200
+
icinga (1.8.0-1) experimental; urgency=low
* [5c6b2b6] Remove build-dep on iputils-ping and do a wrap-and-sort
diff --combined debian/control
index 8ecfadb,37cb67d..acc9889
--- a/debian/control
+++ b/debian/control
@@@ -21,6 -21,7 +21,6 @@@ Architecture: al
Depends: adduser,
bsd-mailx | mailx,
coreutils (>= 4.5.3),
- dpkg (>= 1.16.1),
lsb-base (>= 3.0-6),
nagios-plugins-basic,
ucf (>= 0.28),
@@@ -52,6 -53,7 +52,7 @@@ Depends: adduser
coreutils (>= 4.5.3),
icinga-common (= ${source:Version}),
libjs-jquery (>= 1.4.2-2~),
+ libjs-jquery-ui,
ucf (>= 0.28),
${misc:Depends},
${perl:Depends},
@@@ -110,6 -112,7 +111,7 @@@ Architecture: an
Depends: icinga-cgi (= ${binary:Version}),
icinga-core (= ${binary:Version}),
${misc:Depends}
+ Recommends: icinga-docs
Suggests: nagios-nrpe-plugin
Description: host and network monitoring system - metapackage
Icinga is a modular monitoring framework for hosts, services, and
diff --combined debian/rules
index ed4098c,8483129..fe67196
--- a/debian/rules
+++ b/debian/rules
@@@ -147,14 -147,16 +147,16 @@@ install-stamp: build-stamp fix-configs-
cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.5.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.5.0-1
cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.6.0-1
cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.7.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.7.0-1
- cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.8.0-1~debmon60+1
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.8.0-1
- cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.9.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.9.0-1
++ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.9.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.9.0-1~debmon60+1
cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.1.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.1-1
cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.3-1
cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.2.99-1
cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.5.0-1
cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.6.0-1
cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.7.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.7.0-1
- cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.8.0-1~debmon60+1
+ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.8.0-1
- cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.9.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.9.0-1
++ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.9.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.9.0-1~debmon60+1
# set up /var/cache/icinga for access by www-data
chgrp www-data ${b}/icinga-common/var/cache/icinga
chmod g+s ${b}/icinga-common/var/cache/icinga
@@@ -162,6 -164,7 +164,7 @@@
chmod 700 ${b}/icinga-common/var/lib/icinga/rw
dh_install -i
rm ${b}/tmp/usr/share/icinga/htdocs/js/jquery-1.8.0.min.js
+ rm -R ${b}/tmp/usr/share/icinga/htdocs/jquery-ui
rm ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/*.in
chmod +x ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/* ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/distributed-monitoring/* ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/redundancy-scenario1/*
# we use the versions in debian
@@@ -172,8 -175,8 +175,8 @@@
dh_installexamples
dh_installlogrotate
dh_installchangelogs -i
- dh_installinit --name icinga -- defaults 30 18
- dh_installinit -n -picinga-idoutils --name ido2db -- defaults 35 20
+ dh_installinit --name icinga --error-handler=init_failed
+ dh_installinit -n -picinga-idoutils --name ido2db
chmod 755 ${b}/icinga-common/var/lib/icinga
# the real version is in -cgi
rm ${b}/icinga-common/etc/icinga/cgi.cfg
--
debian packaging of icinga(-core)
More information about the Pkg-nagios-changes
mailing list