summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/ssh-askpass-gnome.postinst7
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 61bbb4234..35406d56f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:4.1p1-7) UNRELEASED; urgency=low
2 2
3 * Do the IDEA host key check on a temporary file to avoid altering 3 * Do the IDEA host key check on a temporary file to avoid altering
4 /etc/ssh/ssh_host_key itself (closes: #312312). 4 /etc/ssh/ssh_host_key itself (closes: #312312).
5 * Work around the ssh-askpass alternative somehow ending up in manual mode
6 pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass.
5 7
6 -- Colin Watson <cjwatson@debian.org> Sat, 9 Jul 2005 23:59:38 +0100 8 -- Colin Watson <cjwatson@debian.org> Sat, 9 Jul 2005 23:59:38 +0100
7 9
diff --git a/debian/ssh-askpass-gnome.postinst b/debian/ssh-askpass-gnome.postinst
index 15290b711..b6c56d4e7 100644
--- a/debian/ssh-askpass-gnome.postinst
+++ b/debian/ssh-askpass-gnome.postinst
@@ -29,6 +29,13 @@ case "$1" in
29 update-alternatives --quiet --remove ssh-askpass \ 29 update-alternatives --quiet --remove ssh-askpass \
30 /usr/lib/ssh/gnome-ssh-askpass 30 /usr/lib/ssh/gnome-ssh-askpass
31 fi 31 fi
32 if dpkg --compare-versions "$2" lt-nl 1:4.1p1-7 && \
33 [ -h /etc/alternatives/ssh-askpass ] && \
34 [ "$(readlink /etc/alternatives/ssh-askpass)" = /usr/lib/ssh/gnome-ssh-askpass ]; then
35 # Work around the ssh-askpass alternative somehow ending up in
36 # manual mode.
37 update-alternatives --auto ssh-askpass
38 fi
32 update-alternatives --quiet \ 39 update-alternatives --quiet \
33 --install /usr/bin/ssh-askpass ssh-askpass \ 40 --install /usr/bin/ssh-askpass ssh-askpass \
34 /usr/lib/openssh/gnome-ssh-askpass 30 \ 41 /usr/lib/openssh/gnome-ssh-askpass 30 \