Drop conffile handling for upgrades from pre-split ssh package; this was

originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a truly ghastly
hack around a misbehaviour in sarge's dpkg.  Since this is now four
Debian releases ago, we can afford to drop this and simplify the
packaging.

1 files changed, 0 insertions, 9 deletions

diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
index cff282d70..2f884b7b7 100644
--- a/debian/openssh-client.postinst
+++ b/debian/openssh-client.postinst
@@ -94,13 +94,6 @@ 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
@@ -109,7 +102,5 @@ 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