summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdebian/rules3
-rw-r--r--debian/ssh-krb5.links1
-rw-r--r--debian/ssh-krb5.postinst5
-rw-r--r--debian/ssh-krb5.prerm14
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
255 dh_testdir 255 dh_testdir
256 dh_testroot 256 dh_testroot
257 dh_installdocs 257 dh_installdocs
258 mv debian/ssh-krb5/usr/share/doc/ssh-krb5 debian/ssh-krb5/usr/share/doc/openssh-client 258 dh_installchangelogs ChangeLog
259 rm -f debian/ssh-krb5/usr/share/doc/openssh-client/copyright
260 dh_link 259 dh_link
261 dh_compress 260 dh_compress
262 dh_fixperms 261 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 @@
1usr/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"
7 7
8if [ "$action" = configure ] ; then 8if [ "$action" = configure ] ; then
9 if dpkg --compare-versions "$oldversion" lt-nl 1:4.3p2-7; then 9 if dpkg --compare-versions "$oldversion" lt-nl 1:4.3p2-7; then
10 if [ ! -L /usr/share/doc/ssh-krb5 ]; then
11 rm -rf /usr/share/doc/ssh-krb5
12 ln -s openssh-client /usr/share/doc/ssh-krb5
13 fi
14
15 # Replaced by /etc/init.d/ssh. 10 # Replaced by /etc/init.d/ssh.
16 if [ -f /etc/init.d/ssh-krb5 ]; then 11 if [ -f /etc/init.d/ssh-krb5 ]; then
17 mv /etc/init.d/ssh-krb5 /etc/init.d/ssh-krb5.dpkg-old 12 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 @@
1#!/bin/sh -e
2
3case $1 in
4 upgrade)
5 if [ -L /usr/share/doc/ssh-krb5 ] && \
6 dpkg --compare-versions "$2" lt-nl 1:4.3p2-7; then
7 rm -f /usr/share/doc/ssh-krb5
8 fi
9 ;;
10esac
11
12#DEBHELPER#
13
14exit 0