Remove /etc/ssh/sshd_not_to_be_run on purge of openssh-server. For now

(until sarge+2) it's still honoured to avoid breaking existing
configurations, but the right approach is now to remove the openssh-server
package if you don't want to run the server. Add a NEWS item to that
effect.

3 files changed, 17 insertions, 0 deletions

diff --git a/debian/NEWS b/debian/NEWS
index 242d719ff..0c645d103 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,14 @@
+openssh (1:3.8.1p1-9) UNRELEASED; urgency=low
+
+  The ssh package has been split into openssh-client and openssh-server. If
+  you had previously requested that the sshd server should not be run, then
+  that request will still be honoured. However, the recommended approach is
+  now to remove the openssh-server package if you do not want to run sshd.
+  You can remove the old /etc/ssh/sshd_not_to_be_run marker file after doing
+  that.
+
+ -- Colin Watson <cjwatson@debian.org>  Sat, 31 Jul 2004 03:01:19 +0100
+
 openssh (1:3.5p1-1) unstable; urgency=low
 
   This version of OpenSSH disables the environment option for public keys by
diff --git a/debian/changelog b/debian/changelog
index 38a7c67ae..1c81c1387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,11 @@ openssh (1:3.8.1p1-9) UNRELEASED; urgency=low
     and ssh/user_environment_tell.
   * Add a heuristic to try to make sure the sshd_config upgrade to >= 3.7
     happens even though we don't know what version we're upgrading from.
+  * Remove /etc/ssh/sshd_not_to_be_run on purge of openssh-server. For now
+    (until sarge+2) it's still honoured to avoid breaking existing
+    configurations, but the right approach is now to remove the
+    openssh-server package if you don't want to run the server. Add a NEWS
+    item to that effect.
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 31 Jul 2004 03:01:19 +0100
 
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm
index 862c51520..e7a437260 100644
--- a/debian/openssh-server.postrm
+++ b/debian/openssh-server.postrm
@@ -12,6 +12,7 @@ then
     rm -f /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub
     rm -f /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key.pub
     rm -f /etc/ssh/sshd_config
+    rm -f /etc/ssh/sshd_not_to_be_run
     rmdir --ignore-fail-on-non-empty /etc/ssh
 fi