Merge from branch-V_3_6_1_P2-7-unstable:

  cvs up -jV_3_6_1_P2-10 -jV_3_6_1_P2-12

1 files changed, 6 insertions, 2 deletions

diff --git a/debian/prerm b/debian/prerm
index 8ed7e07ec..5c1aa1351 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -20,8 +20,12 @@ case "$1" in
         update-alternatives --quiet --remove rsh /usr/bin/ssh
         update-alternatives --quiet --remove rlogin /usr/bin/slogin
         update-alternatives --quiet --remove rcp /usr/bin/scp
-        if [ -e /etc/init.d/ssh ]; then
-                /etc/init.d/ssh stop
+        if [ -x /etc/init.d/ssh ]; then
+                if [ -x /usr/sbin/invoke-rc.d ]; then
+                        invoke-rc.d ssh stop
+                else
+                        /etc/init.d/ssh stop
+                fi
         fi
 #       install-info --quiet --remove /usr/info/ssh-askpass.info.gz
         ;;