don't symlink /usr/share/doc/ssh-krb5; we have a separate NEWS file to put there

4 files changed, 1 insertions, 22 deletions

diff --git a/debian/rules b/debian/rules
index 1d7cc0295..1883803a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -255,8 +255,7 @@ binary-ssh-krb5: build install
         dh_testdir
         dh_testroot
         dh_installdocs
-        mv debian/ssh-krb5/usr/share/doc/ssh-krb5 debian/ssh-krb5/usr/share/doc/openssh-client
-        rm -f debian/ssh-krb5/usr/share/doc/openssh-client/copyright
+        dh_installchangelogs ChangeLog
         dh_link
         dh_compress
         dh_fixperms
diff --git a/debian/ssh-krb5.links b/debian/ssh-krb5.links
deleted file mode 100644
index 3334b9988..000000000
--- a/debian/ssh-krb5.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/openssh-client usr/share/doc/ssh-krb5
diff --git a/debian/ssh-krb5.postinst b/debian/ssh-krb5.postinst
index 989a66801..b1bea1e29 100644
--- a/debian/ssh-krb5.postinst
+++ b/debian/ssh-krb5.postinst
@@ -7,11 +7,6 @@ oldversion="$2"
 
 if [ "$action" = configure ] ; then
     if dpkg --compare-versions "$oldversion" lt-nl 1:4.3p2-7; then
-        if [ ! -L /usr/share/doc/ssh-krb5 ]; then
-            rm -rf /usr/share/doc/ssh-krb5
-            ln -s openssh-client /usr/share/doc/ssh-krb5
-        fi
-
         # Replaced by /etc/init.d/ssh.
         if [ -f /etc/init.d/ssh-krb5 ]; then
             mv /etc/init.d/ssh-krb5 /etc/init.d/ssh-krb5.dpkg-old
diff --git a/debian/ssh-krb5.prerm b/debian/ssh-krb5.prerm
deleted file mode 100644
index d3434e783..000000000
--- a/debian/ssh-krb5.prerm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-case $1 in
-        upgrade)
-                if [ -L /usr/share/doc/ssh-krb5 ] && \
-                   dpkg --compare-versions "$2" lt-nl 1:4.3p2-7; then
-                        rm -f /usr/share/doc/ssh-krb5
-                fi
-                ;;
-esac
-
-#DEBHELPER#
-
-exit 0