4 files changed, 9 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index d722516c1..c1aa043f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:3.8.1p1-11) UNRELEASED; urgency=low
+
+  * Move sshd_config(5) to openssh-server, where it belongs.
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 31 Aug 2004 04:30:34 +0100
+
 openssh (1:3.8.1p1-10) experimental; urgency=low
 
   * Don't install the ssh-askpass-gnome .desktop file by default; I've had
diff --git a/debian/control b/debian/control
index 3fd8b21f9..d604d1015 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version})
 Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1)
-Replaces: ssh (<< 1:3.8.1p1-9)
+Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11)
 Suggests: ssh-askpass, xbase-clients
 Provides: ssh-server
 Description: Secure shell server, an rshd replacement
diff --git a/debian/openssh-server.dirs b/debian/openssh-server.dirs
index 3d434da75..85ee171be 100644
--- a/debian/openssh-server.dirs
+++ b/debian/openssh-server.dirs
@@ -2,5 +2,6 @@ etc/init.d
 etc/default
 usr/lib
 usr/sbin
+usr/share/man/man5
 usr/share/man/man8
 var/run/sshd
diff --git a/debian/rules b/debian/rules
index 8295fc05e..63c438192 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,6 +124,7 @@ install: build
         # Split off the server.
         mv debian/openssh-client/usr/sbin/sshd debian/openssh-server/usr/sbin/
         mv debian/openssh-client/usr/lib/sftp-server debian/openssh-server/usr/lib/
+        mv debian/openssh-client/usr/share/man/man5/sshd_config.5 debian/openssh-server/usr/share/man/man5/
         mv debian/openssh-client/usr/share/man/man8/sshd.8 debian/openssh-server/usr/share/man/man8/
         mv debian/openssh-client/usr/share/man/man8/sftp-server.8 debian/openssh-server/usr/share/man/man8/
         rmdir debian/openssh-client/var/run/sshd