[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, debmon-wheezy, updated. debian/1.9.1-1_debmon70+1-17-g5049373

[Alexander Wirt]

The following commit has been merged in the debmon-wheezy branch:
commit 2f0e682bc87e826a9c17ad127c41638db9cb8443
Merge: cbbc1533cd06b7ff9def503e481962514919937a e6a53b239651d7ed9ca3715ed17b0cf74640c58f
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue May 7 23:13:43 2013 +0200

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog
    	debian/rules

diff --combined debian/changelog
index 6b5ff22,38e73a0..1e888ed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- icinga (1.8.4-1~debmon70+1) debmon-wheezy; urgency=low
++icinga (1.9.0-1~debmon70+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 14 Jan 2013 21:55:21 +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
++>>>>>>> master
+ 
  icinga (1.8.4-1) experimental; urgency=high
  
    * [a466a1e] Replace /etc/init.d with service
@@@ -19,12 -31,6 +38,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.1-1~debmon70+2) debmon-wheezy; urgency=low
 +
 +  * [01d95df] Fix sql of sql upgrade file to prevent doubled execution
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 25 Oct 2012 17:11:56 +0200
 +
  icinga (1.8.2-1) experimental; urgency=low
  
    * [868de52] Imported Upstream version 1.8.2
@@@ -45,13 -51,6 +64,13 @@@ icinga (1.8.1-1) experimental; urgency=
  
   -- Alexander Wirt <formorer at debian.org>  Thu, 25 Oct 2012 07:04:55 +0200
  
 +icinga (1.8.0-1~debmon70+1) debmon-wheezy; urgency=low
 +
 +  * rebuild for debmon
 +  * [c265ca4] Add gbp.conf
 +
 + -- Alexander Wirt <formorer at debian.org>  Fri, 19 Oct 2012 17:43:34 +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/rules
index 66bf799,8483129..85e2176
--- a/debian/rules
+++ b/debian/rules
@@@ -146,15 -146,17 +146,18 @@@ install-stamp: build-stamp fix-configs-
  	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.4.0
  	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.7.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.7.0-1~debmon70+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~debmon70+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/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
 -	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.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.8.0-1~debmon70+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~debmon70+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 +165,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 +176,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)