[SCM] Debian packaging for apache2 branch, master, updated. debian/2.2.22-3-34-g2f4956a

[Arno Töll]

The following commit has been merged in the master branch:
commit 62a7dbb4beacf74188c1006707e2b78e50b0a868
Author: Arno Töll <arno at debian.org>
Date:   Mon Jun 11 23:53:15 2012 +0200

    Revert "Fix problems in the init script: Do actually stop the web server on stop, do"
    
    This reverts commit 07b0a1c7f73e4703112a7eaf45dc8999ac4ac5b2.

diff --git a/debian/apache2.2-common.apache2.init b/debian/apache2.2-common.apache2.init
index 88a209a..d64c8f3 100755
--- a/debian/apache2.2-common.apache2.init
+++ b/debian/apache2.2-common.apache2.init
@@ -180,15 +180,11 @@ do_stop()
 #
 do_reload() {
         if $APACHE2CTL configtest > /dev/null 2>&1; then
-	        if ! pidofproc "$DAEMON" -p $PIDFILE > /dev/null 2>&1 ; then
-                        APACHE2_INIT_MESSAGE="Apache2 is not running"
-                        return 2
-                fi
                 $APACHE2CTL graceful > /dev/null 2>&1
                 return $?
         else
                 APACHE2_INIT_MESSAGE="The apache2$DIR_SUFFIX configtest failed. Not doing anything."
-                return 0
+                return 2
         fi
 }
 
@@ -289,7 +285,7 @@ case "$1" in
 	;;
   restart)
 	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop stop
+	do_stop
 	case "$?" in
 	  0|1)
 		do_start

-- 
Debian packaging for apache2