summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2004-08-31 03:34:24 +0000
committerColin Watson <cjwatson@debian.org>2004-08-31 03:34:24 +0000
commit77be91fc874d0bdfb00e2da57550ff9c8969a6d4 (patch)
tree878cd907309428bfdd25607730013fc9e346eb5d
parentbd2d6776a7ec2052afc6e3f085a1f3025ab072db (diff)
Move sshd_config(5) to openssh-server, where it belongs.
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--debian/openssh-server.dirs1
-rwxr-xr-xdebian/rules1
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 @@
1openssh (1:3.8.1p1-11) UNRELEASED; urgency=low
2
3 * Move sshd_config(5) to openssh-server, where it belongs.
4
5 -- Colin Watson <cjwatson@debian.org> Tue, 31 Aug 2004 04:30:34 +0100
6
1openssh (1:3.8.1p1-10) experimental; urgency=low 7openssh (1:3.8.1p1-10) experimental; urgency=low
2 8
3 * Don't install the ssh-askpass-gnome .desktop file by default; I've had 9 * 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
38Architecture: any 38Architecture: any
39Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version}) 39Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version})
40Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1) 40Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1)
41Replaces: ssh (<< 1:3.8.1p1-9) 41Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11)
42Suggests: ssh-askpass, xbase-clients 42Suggests: ssh-askpass, xbase-clients
43Provides: ssh-server 43Provides: ssh-server
44Description: Secure shell server, an rshd replacement 44Description: 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
2etc/default 2etc/default
3usr/lib 3usr/lib
4usr/sbin 4usr/sbin
5usr/share/man/man5
5usr/share/man/man8 6usr/share/man/man8
6var/run/sshd 7var/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
124 # Split off the server. 124 # Split off the server.
125 mv debian/openssh-client/usr/sbin/sshd debian/openssh-server/usr/sbin/ 125 mv debian/openssh-client/usr/sbin/sshd debian/openssh-server/usr/sbin/
126 mv debian/openssh-client/usr/lib/sftp-server debian/openssh-server/usr/lib/ 126 mv debian/openssh-client/usr/lib/sftp-server debian/openssh-server/usr/lib/
127 mv debian/openssh-client/usr/share/man/man5/sshd_config.5 debian/openssh-server/usr/share/man/man5/
127 mv debian/openssh-client/usr/share/man/man8/sshd.8 debian/openssh-server/usr/share/man/man8/ 128 mv debian/openssh-client/usr/share/man/man8/sshd.8 debian/openssh-server/usr/share/man/man8/
128 mv debian/openssh-client/usr/share/man/man8/sftp-server.8 debian/openssh-server/usr/share/man/man8/ 129 mv debian/openssh-client/usr/share/man/man8/sftp-server.8 debian/openssh-server/usr/share/man/man8/
129 rmdir debian/openssh-client/var/run/sshd 130 rmdir debian/openssh-client/var/run/sshd