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, 13 deletions

diff --git a/debian/openssh-client.postrm b/debian/openssh-client.postrm
index eb6fde06b..2b29a098b 100644
--- a/debian/openssh-client.postrm
+++ b/debian/openssh-client.postrm
@@ -2,20 +2,7 @@
 
 #DEBHELPER#
 
-abort_transfer_conffile () {
-        CONFFILE="$1"
-        if [ -e "$CONFFILE.moved-by-preinst" ]; then
-                echo >&2 "Aborting ownership transfer of conffile $CONFFILE ..."
-                mv -f "$CONFFILE.moved-by-preinst" "$CONFFILE"
-                return 0
-        fi
-}
-
 case $1 in
-        abort-install|abort-upgrade)
-                abort_transfer_conffile /etc/ssh/moduli
-                abort_transfer_conffile /etc/ssh/ssh_config
-                ;;
         purge)
                 # Remove all non-conffiles that ssh might create, so that we
                 # can smoothly remove /etc/ssh if and only if the user