[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, debmon-squeeze, updated. debian/1.8.3-1-7-gc349e65

[Markus Frosch]

The following commit has been merged in the debmon-squeeze branch:
commit bd0e06d0873b0f1382fb3a51d1c95b64b1750e0f
Merge: 2d390acd46d6ff880344cbbf864e74e99acabea8 4f56183681e302e901cca0f837118b041f50ac4d
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Mar 25 16:59:46 2013 +0100

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

diff --combined debian/changelog
index a2ffac5,b9f2761..f084af1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ icinga-web (1.8.3-1) experimental; urgency=low
+ 
+   * [bba67b0] Removing own symlinks to nagios-images.
+     The links are now provided by nagios-images itself
+   * [4aa93b9] Imported Upstream version 1.8.3
+   * [1e1e363] Debian package updates for 1.8.3
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Mon, 25 Mar 2013 16:41:30 +0100
+ 
 +icinga-web (1.8.2-1~debmon60+1) debmon-squeeze; urgency=low
 +
 +  * Rebuild for debmon-squeeze.
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Tue, 12 Feb 2013 18:06:34 +0100
 +
  icinga-web (1.8.2-1) experimental; urgency=low
  
    * [5a03f8a] bump standards version
@@@ -13,12 -16,6 +22,12 @@@
  
   -- Markus Frosch <markus at lazyfrosch.de>  Tue, 12 Feb 2013 17:48:09 +0100
  
 +icinga-web (1.8.1-1~debmon60+1) debmon-squeeze; urgency=low
 +
 +  * Rebuild for debmon-squeeze.
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Thu, 06 Dec 2012 19:32:59 +0100
 +
  icinga-web (1.8.1-1) experimental; urgency=low
  
    * [5f0e216] Debconf language update for ja (Japanese)
@@@ -34,12 -31,6 +43,12 @@@
  
   -- Markus Frosch <markus at lazyfrosch.de>  Mon, 6 Dec 2012 19:07:11 +0100
  
 +icinga-web (1.8.0-1~debmon60+1) debmon-squeeze; urgency=low
 +
 +  * Rebuild for squeeze on debmon.org
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Thu, 18 Oct 2012 22:26:20 +0200
 +
  icinga-web (1.8.0-1) experimental; urgency=low
  
    * [265f0d7] Imported Upstream version 1.8.0~beta

-- 
Debian packaging of icinga-web