3 files changed, 9 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index a0ce59273..28d579080 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -147,6 +147,9 @@ openssh (1:5.1p1-1) UNRELEASED; urgency=low
   * Add lintian overrides for empty /usr/share/doc/openssh-client
     directories in openssh-server and ssh (necessary due to being symlink
     targets).
+  * Merge from Ubuntu:
+    - Add 'status' action to openssh-server init script, requiring lsb-base
+      (>= 3.2-13) (thanks, Dustin Kirkland).
   * debconf template translations:
     - Update Korean (thanks, Sunjae Park; closes: #484821).
 
diff --git a/debian/control b/debian/control
index 12e98fa4a..27b27e756 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: secure shell client, an rlogin/rsh/rcp replacement
 Package: openssh-server
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.0-6), libssl0.9.8 (>= 0.9.8g-9), openssh-blacklist
+Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), libssl0.9.8 (>= 0.9.8g-9), openssh-blacklist
 Recommends: xauth, openssh-blacklist-extra
 Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
 Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index 01f00dc0a..a1cc67797 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -151,8 +151,12 @@ case "$1" in
         esac
         ;;
 
+  status)
+        status_of_proc -p /var/run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $?
+        ;;
+
   *)
-        log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart}"
+        log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart|status}"
         exit 1
 esac