[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 1ab38112684acdec15b67a14280d731639041f8c
Merge: 8a6f5162a11696c24e521e1459ca8a3f44c7d6e0 e6a53b239651d7ed9ca3715ed17b0cf74640c58f
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed May 8 07:10:47 2013 +0200

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

diff --combined debian/changelog
index 694bad3,38e73a0..218acf0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- icinga (1.8.4-1~ppa1~lucid1) lucid; urgency=low
++icinga (1.9.0-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.0-1) unstable; urgency=low
+ 
+   * [006e77b] Allow www-data to read those archived logs
+   * [c732717] Don't destroy symlinked icinga configs with sed (Closes: #698137)
+   * [4a63fdf] install jquery-ui
+   * [d905069] Use bundled jquery-ui version
+   * [8110db1] Imported Upstream version 1.9.0
+     - Event profiling is now deprecated (Closes: #614356)
+   * [91e3d0b] Install 1.9.0 sql files
+   * [7d35822] Move stylesheets to cgi (Closes: #682334)
+   * [914bc33] Use debians jquery-ui and fix timepicker locations
+   * [51e1d00] Improve errorhandling in initscript (Closes: #698139)
+   * [0ed174a] Add indonesian debconf translation.
+     Thanks to Mahyuddin Susanto (Closes: #695651)
+   * [bbaa9f6] Recommend icinga-docs in the icinga metapackage (Closes: #682359)
+ 
+  -- Alexander Wirt <formorer at debian.org>  Tue, 07 May 2013 16:18:34 +0200
++>>>>>>> master
+ 
  icinga (1.8.4-1) experimental; urgency=high
  
    * [a466a1e] Replace /etc/init.d with service
@@@ -19,14 -31,6 +38,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
@@@ -118,14 -122,6 +137,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 b5ac527,37cb67d..b01662a
--- a/debian/control
+++ b/debian/control
@@@ -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),
@@@ -53,6 -53,7 +53,7 @@@ Depends: adduser
           coreutils (>= 4.5.3),
           icinga-common (= ${source:Version}),
           libjs-jquery (>= 1.4.2-2~),
+          libjs-jquery-ui,
           ucf (>= 0.28),
           ${misc:Depends},
           ${perl:Depends},
@@@ -111,6 -112,7 +112,7 @@@ Architecture: an
  Depends: icinga-cgi (= ${binary:Version}),
           icinga-core (= ${binary:Version}),
           ${misc:Depends}
+ Recommends: icinga-docs
  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)