[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, debmon-squeeze, updated. debian/1.9.1-1_debmon60+1-18-g0b90280

[Alexander Wirt]

The following commit has been merged in the debmon-squeeze branch:
commit 1552f1f789cbfc747c4790cfafeb11384f737382
Merge: 20b6afe7c85c24df210668a8250159bfbe4e9108 de82eae48a4b586ea7f3a45d6669fd2fb692560f
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Jul 18 22:48:33 2013 +0200

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

diff --combined debian/changelog
index ead3ace,b4e6d6e..8184f03
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- icinga (1.9.1-1~debmon60+1) debmon-squeeze; urgency=low
++icinga (1.9.3-1~debmon60+1) debmon-squeeze; urgency=low
 +
 +  * Rebuild for debmon
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 14 Jan 2013 21:19:09 +0100
 +
+ icinga (1.9.3-1) unstable; urgency=low
+ 
+   * [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>  Wed, 10 Jul 2013 23:33:15 +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
++>>>>>>> master
+ 
  icinga (1.9.1-1) unstable; urgency=low
  
    * [fe88365] Fix dependency on on icinga-doc
@@@ -45,12 -55,6 +62,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.2-1~debmon60+1) debmon-squeeze; urgency=low
 +
 +  * Rebuild for debmon
 +
 + -- Alexander Wirt <formorer at debian.org>  Wed, 28 Nov 2012 18:00:38 +0100
 +
  icinga (1.8.2-1) experimental; urgency=low
  
    * [868de52] Imported Upstream version 1.8.2
@@@ -64,18 -68,6 +81,18 @@@ icinga (1.8.1-2) experimental; urgency=
  
   -- Alexander Wirt <formorer at debian.org>  Sun, 04 Nov 2012 21:57:50 +0100
  
 +icinga (1.8.1-1~debmon60+2) debmon-squeeze; urgency=low
 +
 +  * [f9c35cb] Fix sql script version, otherwise it get applied twice which fails
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 25 Oct 2012 15:13:24 +0200
 +
 +icinga (1.8.1-1~debmon60+1) debmon-squeeze; urgency=low
 +
 +  * Rebuild for debmon-squeeze
 +
 + -- Alexander Wirt <formorer at debian.org>  Thu, 25 Oct 2012 07:23:52 +0200
 +
  icinga (1.8.1-1) experimental; urgency=low
  
    * [5947e03] Remove useless echo in do_stop of icingas initscript
@@@ -83,14 -75,6 +100,14 @@@
  
   -- Alexander Wirt <formorer at debian.org>  Thu, 25 Oct 2012 07:04:55 +0200
  
 +icinga (1.8.0-1~debmon60+1) debmon-squeeze; urgency=low
 +
 +  * [888d92e] Add gbp.conf
 +  * [8e19039] Replace --status with --test in ido2dbs initscript
 +  * [9c53523] Fix gbp config
 +
 + -- Alexander Wirt <formorer at debian.org>  Fri, 19 Oct 2012 17:04:48 +0200
 +
  icinga (1.8.0-1) experimental; urgency=low
  
    * [5c6b2b6] Remove build-dep on iputils-ping and do a wrap-and-sort
diff --combined debian/control
index 1a99734,b703979..fc974a1
--- a/debian/control
+++ b/debian/control
@@@ -11,7 -11,7 +11,7 @@@ Build-Depends: autotools-dev
                 dpatch (>= 2.0.10),
                 dpkg-dev (>= 1.13.19),
                 libdbi-dev | libdbi0-dev,
-                libgd3-dev | libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1),
+                libgd-dev | libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1),
                 libperl-dev,
                 libpng-dev | libpng12-dev,
                 po-debconf
@@@ -21,6 -21,7 +21,6 @@@ Architecture: al
  Depends: adduser,
           bsd-mailx | mailx,
           coreutils (>= 4.5.3),
 -         dpkg (>= 1.16.1),
           lsb-base (>= 3.0-6),
           nagios-plugins-basic,
           ucf (>= 0.28),

-- 
debian packaging of icinga(-core)