* When installing openssh-client or openssh-server from scratch, remove

  any unchanged conffiles from the pre-split ssh package to work around a
  bug in sarge's dpkg (thanks, Justin Pryzby and others; closes: #335276).

1 files changed, 9 insertions, 0 deletions

diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
index 466801057..3e33aeb82 100644
--- a/debian/openssh-client.postinst
+++ b/debian/openssh-client.postinst
@@ -94,6 +94,13 @@ set_ssh_agent_permissions() {
         fi
 }
 
+commit_transfer_conffile () {
+        CONFFILE="$1"
+        if [ -e "$CONFFILE.moved-by-preinst" ]; then
+                rm -f "$CONFFILE.moved-by-preinst"
+        fi
+}
+
 
 fix_rsh_diversion
 create_alternatives
@@ -102,5 +109,7 @@ if [ "$2" = "1:3.5p1-1" ]; then
     fix_ssh_group
 fi
 set_ssh_agent_permissions
+commit_transfer_conffile /etc/ssh/moduli
+commit_transfer_conffile /etc/ssh/ssh_config
 
 exit 0