* Merge 1:5.5p1-6.

1 files changed, 10 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 87da21257..b499cde66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:5.6p1-3) UNRELEASED; urgency=low
 
   * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no
     longer issues.
+  * Merge 1:5.5p1-6.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 02 Nov 2010 23:00:07 +0000
 
@@ -29,6 +30,15 @@ openssh (1:5.6p1-1) experimental; urgency=low
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 24 Aug 2010 00:37:54 +0100
 
+openssh (1:5.5p1-6) unstable; urgency=low
+
+  * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd,
+    which is intentionally no longer shipped in the openssh-server package
+    due to /var/run often being a temporary directory, is not removed on
+    upgrade (closes: #575582).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 26 Dec 2010 18:09:29 +0000
+
 openssh (1:5.5p1-5) unstable; urgency=low
 
   * Use an architecture wildcard for libselinux1-dev (closes: #591740).