[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 3.2.0-5-2-g32bd268

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 32bd2681f6c9feaf9ca51aa85de2e4d31086fe98
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Mar 18 10:32:28 2010 +0100

    Fix lsb-base logic #561357

diff --git a/debian/changelog b/debian/changelog
index 226ce22..46ed597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ nagios3 (3.2.0-5) unstable; urgency=low
 
   [ Alexander Wirt ]
   * Don't rely on nagios3-cgi in initscript 
+  * Fix init-functions logic (Closes: #561357)
 
  -- Alexander Wirt <formorer at debian.org>  Mon, 16 Nov 2009 23:14:58 +0100
 
diff --git a/debian/control b/debian/control
index 9fd2c87..8459573 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 6.0.7~), dpatch (>= 2.0.10), po-debconf, libperl-de
 
 Package: nagios3-common
 Architecture: all
-Depends: nagios-plugins-basic, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-3), ucf (>= 0.28), ${misc:Depends}, ${perl:Depends}, ${misc:Depends}
+Depends: nagios-plugins-basic, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-6), ucf (>= 0.28), ${misc:Depends}, ${perl:Depends}, ${misc:Depends}
 Recommends: nagios-plugins
 Description: support files for nagios3
  Nagios is a monitoring and management system for hosts, services and
diff --git a/debian/nagios3-common.nagios3.init b/debian/nagios3-common.nagios3.init
index cfb0f63..b5141eb 100644
--- a/debian/nagios3-common.nagios3.init
+++ b/debian/nagios3-common.nagios3.init
@@ -5,6 +5,7 @@
 #               Clamav version by Magnus Ekdahl <magnus at debian.org>
 #		Nagios version by Sean Finney <seanius at debian.org> and probably others
 #		nagios2 version by Marc Haber <mh+debian-packages at zugschlus.de>
+#		nagios3 version by Alexander Wirt <formorer at debian.org>
 
 ### BEGIN INIT INFO
 # Provides:          nagios3
@@ -20,12 +21,7 @@
 
 set -e
 
-if ! [ -x "/lib/lsb/init-functions" ]; then
-  . /lib/lsb/init-functions
-else
-  echo "E: /lib/lsb/init-functions not found, lsb-base (>= 3.0-6) needed"
-  exit 1
-fi
+. /lib/lsb/init-functions
 
 DAEMON=/usr/sbin/nagios3
 NAME="nagios3"
@@ -37,6 +33,7 @@ NICENESS=5
 [ -x "$DAEMON" ] || exit 0
 [ -r /etc/default/nagios3 ] && . /etc/default/nagios3
 
+
 # this is from madduck on IRC, 2006-07-06
 # There should be a better possibility to give daemon error messages
 # and/or to log things

-- 
UNNAMED PROJECT