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

diff --git a/debian/openssh-server.postinst.in b/debian/openssh-server.postinst.in
index 9aa568292..9869c9b48 100644
--- a/debian/openssh-server.postinst.in
+++ b/debian/openssh-server.postinst.in
@@ -440,13 +440,6 @@ setup_init() {
         esac
 }
 
-commit_transfer_conffile () {
-        CONFFILE="$1"
-        if [ -e "$CONFFILE.moved-by-preinst" ]; then
-                rm -f "$CONFFILE.moved-by-preinst"
-        fi
-}
-
 commit_mv_conffile () {
         OLDCONFFILE="$1"
         NEWCONFFILE="$2"
@@ -477,9 +470,6 @@ if dpkg --compare-versions "$2" lt 1:5.2p1-1; then
     remove_old_init_links
 fi
 setup_init
-commit_transfer_conffile /etc/default/ssh
-commit_transfer_conffile /etc/init.d/ssh
-commit_transfer_conffile /etc/pam.d/ssh
 commit_mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd
 # Renamed to /etc/ssh/moduli in 2.9.9 (!)
 if dpkg --compare-versions "$2" lt 1:4.7p1-1; then