6 files changed, 34 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index e0497a292..3d983a9df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 openssh (1:6.5p1-5) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Add Alias=sshd.service to systemd ssh.service file, to match "Provides:
     sshd" in the sysvinit script (thanks, Michael Biebl).
 
+  [ Axel Beckert ]
+  * Split sftp-server into its own package to allow it to also be used by
+    other SSH server implementations like dropbear (closes: #504290).
+
  -- Colin Watson <cjwatson@debian.org>  Fri, 21 Feb 2014 15:21:30 +0000
 
 openssh (1:6.5p1-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 419cc31ae..824f34887 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Package: openssh-server
 Priority: optional
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps, openssh-sftp-server
 Recommends: xauth, ncurses-term, ${openssh-server:Recommends}
 Conflicts: ssh-socks, ssh2, sftp
 Replaces: ssh, ssh-krb5
@@ -73,6 +73,31 @@ Description: secure shell (SSH) server, for secure access from remote machines
  sshd replaces the insecure rshd program, which is obsolete for most
  purposes.
 
+Package: openssh-sftp-server
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: openssh-server | ssh-server
+Breaks: openssh-server (<< 1:6.5p1-4)
+Replaces: openssh-server (<< 1:6.5p1-4)
+Enhances: openssh-server, ssh-server
+Description: secure shell (SSH) sftp server module, for SFTP access from remote machines
+ This is the portable version of OpenSSH, a free implementation of
+ the Secure Shell protocol as specified by the IETF secsh working
+ group.
+ .
+ Ssh (Secure Shell) is a program for logging into a remote machine
+ and for executing commands on a remote machine.
+ It provides secure encrypted communications between two untrusted
+ hosts over an insecure network. X11 connections and arbitrary TCP/IP
+ ports can also be forwarded over the secure channel.
+ It can be used to provide applications with a secure communication
+ channel.
+ .
+ This package provides the SFTP server module for the SSH server. It
+ is needed if you want to access your SSH server with SFTP. The SFTP
+ server module also works with other SSH daemons like dropbear.
+
 Package: ssh
 Priority: extra
 Architecture: all
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
index d04788cca..149222dad 100644
--- a/debian/openssh-server.install
+++ b/debian/openssh-server.install
@@ -1,8 +1,6 @@
-usr/lib/openssh/sftp-server
 usr/sbin/sshd
 usr/share/man/man5/authorized_keys.5
 usr/share/man/man5/sshd_config.5
-usr/share/man/man8/sftp-server.8
 usr/share/man/man8/sshd.8
 
 debian/systemd/ssh.socket lib/systemd/system
diff --git a/debian/openssh-server.links b/debian/openssh-server.links
index 2d98b1dcb..e69de29bb 100644
--- a/debian/openssh-server.links
+++ b/debian/openssh-server.links
@@ -1 +0,0 @@
-usr/lib/openssh/sftp-server usr/lib/sftp-server
diff --git a/debian/openssh-sftp-server.install b/debian/openssh-sftp-server.install
new file mode 100644
index 000000000..25b12dc09
--- /dev/null
+++ b/debian/openssh-sftp-server.install
@@ -0,0 +1,2 @@
+usr/lib/openssh/sftp-server
+usr/share/man/man8/sftp-server.8
diff --git a/debian/openssh-sftp-server.links b/debian/openssh-sftp-server.links
new file mode 100644
index 000000000..2d98b1dcb
--- /dev/null
+++ b/debian/openssh-sftp-server.links
@@ -0,0 +1 @@
+usr/lib/openssh/sftp-server usr/lib/sftp-server