[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, ubuntu-lucid, updated. debian/1.8.2-1-12-gbe223a2

[Alexander Wirt]

The following commit has been merged in the ubuntu-lucid branch:
commit be223a2e8bf4996ff4194c80d3d9fb095a5905d5
Merge: 501346016b3283af4a979270f814e1d7838f5288 cb9e4b6d7a5ba049599042986697c81258e46ebe
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Dec 13 23:14:30 2012 +0100

    Merge branch 'master' into ubuntu-lucid
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 96590cf,3edc7ce..8b13da1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,15 +1,29 @@@
++icinga (1.8.3-1~ppa1~lucid1) lucid; urgency=low
++
++  * Update ppa to 1.8.3-1
++
++ -- Alexander Wirt <formorer at debian.org>  Thu, 13 Dec 2012 23:13:53 +0100
++
+ icinga (1.8.3-1) experimental; urgency=low
+ 
+   * [5330072] Imported Upstream version 1.8.3
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 13 Dec 2012 21:41:33 +0100
+ 
 +icinga (1.8.1-2~ppa1~quantal2) quantal; urgency=low
 +
 +  * Update ppa to 1.8.1-2
 +    - Replace s-s-d --status with --test and remove versioned
 +      depends on dpkg
 +
 + -- Alexander Wirt <formorer at debian.org>  Sun, 04 Nov 2012 22:37:18 +0100
 +
+ icinga (1.8.2-1) experimental; urgency=low
+ 
+   * [868de52] Imported Upstream version 1.8.2
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 28 Nov 2012 17:25:15 +0100
+ 
  icinga (1.8.1-2) experimental; urgency=low
  
    * [4fb9f91] Fix broker filename in idoutils README.Debian.
@@@ -91,14 -95,6 +109,14 @@@ icinga (1.7.1-1) unstable; urgency=lo
  
   -- Alexander Wirt <formorer at debian.org>  Thu, 21 Jun 2012 00:09:52 +0200
  
 +icinga (1.7.0-4~ppa1~lucid1) lucid; urgency=low
 +
 +  * [b66eda1] Fix icinga-idoutils.ido2db initscipt
 +    - replace "--status" with "--start --test", "--status" not available on
 +    lucid.
 +
 + -- Alexander Wirt <formorer at debian.org>  Fri, 15 Jun 2012 20:42:03 +0200
 +
  icinga (1.7.0-4) unstable; urgency=low
  
    * [704a3bc] Quote version for dpkg-compare

-- 
debian packaging of icinga(-core)