[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 50493734f04091abce804e15f5c3cbad8925fa12
Merge: cb3fd0e1d091c0ccfb28cb41ab68938ce2213b9e 5f0ac54d4846282a627ead930d376cee5f8aa938
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Jul 20 09:53:23 2013 +0200

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

diff --combined debian/changelog
index af2fc0d,c6c7b2e..55f9c70
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,27 @@@
- icinga (1.9.1-1~debmon70+1) debmon-wheezy; urgency=low
++icinga (1.9.3-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.3-1) unstable; urgency=low
+ 
+   * [db397b3] Remove obsolete debconf po templates
+   * [de82eae] Don't give the htpasswd password on the commandline
+   * [d031d94] Fix path to idoutils example config (Closes: #714240)
+   * [940f7de] Move apache config to /usr/share
+   * [7b2ec2a] Imported Upstream version 1.9.2
+     - Don't crash with fuzzy input (Closes: #716027)
+   * [e188314] Imported Upstream version 1.9.3
+ 
+  -- Alexander Wirt <formorer at debian.org>  Fri, 19 Jul 2013 21:31:19 +0200
+ 
+ icinga (1.9.1-2) unstable; urgency=low
+ 
+   * [9c53a84] Fix dependency on libgd3 (Closes: #710839)
+ 
+  -- Alexander Wirt <formorer at debian.org>  Mon, 03 Jun 2013 08:08:21 +0200
+ 
  icinga (1.9.1-1) unstable; urgency=low
  
    * [fe88365] Fix dependency on on icinga-doc
@@@ -29,7 -41,6 +47,6 @@@ icinga (1.9.0-1) unstable; urgency=lo
    * [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
  
@@@ -46,12 -57,6 +63,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
@@@ -72,13 -77,6 +89,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

-- 
debian packaging of icinga(-core)