[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, ubuntu-lucid, updated. debian/1.9.1-1-14-g2100a65

[Alexander Wirt]

The following commit has been merged in the ubuntu-lucid branch:
commit 5a715875d3e807b0710ec682e5ef2e6fc70de4ca
Merge: 2e87f8cf3df4ba7fa52460bbbedfea3fff7131f9 de9a084418de64573ec212099bd212c3c27d4330
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu May 23 13:12:04 2013 +0200

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

diff --combined debian/changelog
index 643e046,fcfa4ff..4361b1c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
- icinga (1.9.0-1~ppa1~lucid1) lucid; urgency=low
++icinga (1.9.1-1~ppa1~lucid1) lucid; urgency=low
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 14 Jan 2013 22:10:43 +0100
 +
+ icinga (1.9.1-1) unstable; urgency=low
+ 
+   * [fe88365] Fix dependency on on icinga-doc
+   * [e07a105] Imported Upstream version 1.9.1
+   * [ce07681] Depend on new libgd3
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 23 May 2013 06:50:50 +0200
+ 
  icinga (1.9.0-1) unstable; urgency=low
  
    * [006e77b] Allow www-data to read those archived logs
@@@ -37,14 -39,6 +45,14 @@@ 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-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
@@@ -136,14 -130,6 +144,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
diff --combined debian/control
index b01662a,7e5861f..4cc55e7
--- 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,
-                libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1),
+                libgd3-dev | libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1),
                 libperl-dev,
                 libpng-dev | libpng12-dev,
                 po-debconf
@@@ -21,7 -21,7 +21,7 @@@ Architecture: al
  Depends: adduser,
           bsd-mailx | mailx,
           coreutils (>= 4.5.3),
 -         dpkg (>= 1.16.1),
 +         dpkg,
           lsb-base (>= 3.0-6),
           nagios-plugins-basic,
           ucf (>= 0.28),
@@@ -112,7 -112,7 +112,7 @@@ Architecture: an
  Depends: icinga-cgi (= ${binary:Version}),
           icinga-core (= ${binary:Version}),
           ${misc:Depends}
- Recommends: icinga-docs
+ Recommends: icinga-doc
  Suggests: nagios-nrpe-plugin
  Description: host and network monitoring system - metapackage
   Icinga is a modular monitoring framework for hosts, services, and

-- 
debian packaging of icinga(-core)