[Pkg-nagios-changes] [pkg-icinga-web] 01/02: Merge branch 'master' into debmon-wheezy

[Markus Frosch]

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

lazyfrosch-guest pushed a commit to branch debmon-wheezy
in repository pkg-icinga-web.

commit 93460e4a73386d1842e7bc7201886bc07f858e74
Merge: 0a126aa 1662678
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Jan 14 12:02:47 2014 +0100

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

 debian/changelog | 13 +++++++++++++
 debian/control   |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index c2b0294,2ea4917..1caf9ad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ icinga-web (1.10.0-2) unstable; urgency=medium
+ 
+   * [9d4c780] Removed unnecessary dependency on icinga-core (Closes: #731840)
+   * [2a9455c] Define icinga-web breaking icinga-idoutils (<< 1.10)
+               This blocks the user from using icinga-web with an old and
+               outdated IDO schema - it could cause still problems when using
+               a remote IDO database, but helps to block incomplete Icinga
+               upgrades on a single server.
+ 
+               Please also see the NEWS entry! (Closes: #732058)
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Sat, 14 Dec 2013 18:02:02 +0100
+ 
 +icinga-web (1.10.0-1~debmon7+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Sat, 26 Oct 2013 19:27:51 +0200
 +
  icinga-web (1.10.0-1) unstable; urgency=low
  
    * [7dae107] Imported Upstream version 1.10.0 (Closes: #719859)

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