[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. 1.0.2-2-10-ge1ee42f

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 43cc793293ed68700fc1e503235a3d166632d77b
Merge: 96cf29c5d002ae0c56eb984587691977d0b807f2 b9779c146254942b64466c084ac9276ba830d1ac
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri Oct 1 19:57:44 2010 +0200

    Merge branch '1.0.3'
    
    Conflicts:
    	debian/changelog
    	debian/patches/00list

diff --combined debian/changelog
index 237f8c5,3626dd3..e318377
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,8 @@@
- icinga (1.0.2-2) unstable; urgency=low
 -icinga (1.0.3-1) experimental; urgency=low
++icinga (1.2-1) experimental; urgency=low
  
-   * Backport some patches from 1.0.3 for squeeze
-     - Fix image urls in css
-     - Don't overwrite temp_path if it is before check_result_path in config
-     - Fix execvp handling 
-     - Fix volatile check 
-     - Fix macro processing in extinfo.cgi
-     - Fix invalid pointer in extinfo.cgi 
+   * New upstream version
+     - Remove 80_remove_daemoncheck_cgi (now upstream)
+   * bump standards version (no changes)
    * Icinga Plugins does not exist
    * Fix typo in watch file
  

-- 
debian packaging of icinga(-core)