[pkg-lighttpd] r420 - lighttpd/trunk/debian

[Krzysztof Krzyzaniak]

Author: eloy
Date: 2010-02-09 17:13:14 +0000 (Tue, 09 Feb 2010)
New Revision: 420

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/control
   lighttpd/trunk/debian/lighttpd.init
Log:
patch for #539955

Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2010-02-09 17:02:37 UTC (rev 419)
+++ lighttpd/trunk/debian/changelog	2010-02-09 17:13:14 UTC (rev 420)
@@ -1,15 +1,11 @@
 lighttpd (1.4.26-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release (closes: #568735)
+  * Use provided patch from  Andres Rodriguez <andreserl at ubuntu.com>
+    to implement status action in init.d script (closes: #539955)
 
  -- Krzysztof Krzyżaniak (eloy) <eloy at debian.org>  Tue, 09 Feb 2010 18:02:13 +0100
 
-lighttpd (1.4.25-3) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Krzysztof Krzyżaniak (eloy) <eloy at debian.org>  Tue, 05 Jan 2010 11:57:01 +0100
-
 lighttpd (1.4.25-2) unstable; urgency=low
 
   * Change behaviour of use-ipv6.pl script (closes: #560837)

Modified: lighttpd/trunk/debian/control
===================================================================
--- lighttpd/trunk/debian/control	2010-02-09 17:02:37 UTC (rev 419)
+++ lighttpd/trunk/debian/control	2010-02-09 17:13:14 UTC (rev 420)
@@ -17,7 +17,7 @@
 Package: lighttpd
 Homepage: http://www.lighttpd.net
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-3), mime-support, libterm-readline-perl-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), mime-support, libterm-readline-perl-perl
 Provides: httpd, httpd-cgi
 Suggests: openssl, rrdtool, apache2-utils
 Recommends: spawn-fcgi

Modified: lighttpd/trunk/debian/lighttpd.init
===================================================================
--- lighttpd/trunk/debian/lighttpd.init	2010-02-09 17:02:37 UTC (rev 419)
+++ lighttpd/trunk/debian/lighttpd.init	2010-02-09 17:13:14 UTC (rev 420)
@@ -74,8 +74,11 @@
             grep -q `cat $PIDFILE 2>/dev/null` 2>/dev/null ; do sleep 1; done
         $0 start
         ;;
+    status)
+        status_of_proc -p "$PIDFILE" "$DAEMON" lighttpd && exit 0 || exit $?
+        ;;
     *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+        echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2
         exit 1
         ;;
 esac