[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-20-g99323a0

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 99323a08e21a5998c013f5adde3dab684ded0a3e
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon May 20 18:52:31 2013 +0200

    give apache more time to start, always print error
    
    ... even if VERBOSE = no

diff --git a/debian/apache2.init b/debian/apache2.init
index d91c7a2..e96dfb2 100755
--- a/debian/apache2.init
+++ b/debian/apache2.init
@@ -85,7 +85,7 @@ apache_wait_start() {
                         return $STATUS
                 fi
 
-                if [ $i = "5" ] ; then
+                if [ $i = "20" ] ; then
                         APACHE2_INIT_MESSAGE="The apache2$DIR_SUFFIX instance did not start within 5 seconds. Please read the log files to discover problems"
                         return 2
                 fi
@@ -274,7 +274,8 @@ case "$1" in
                 ;;
 		2)
                         [ "$VERBOSE" != no ] && log_end_msg 1
-                        [ "$VERBOSE" != no ] && [ "x$APACHE2_INIT_MESSAGE" != "x" ] && log_failure_msg "$APACHE2_INIT_MESSAGE"
+                        [ -n "$APACHE2_INIT_MESSAGE" ] && echo $APACHE2_INIT_MESSAGE >&2
+                        log_failure_msg
                ;;
 	esac
 	;;

-- 
Debian packaging for apache2