diff options
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/openssh-server.preinst | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 39199b96d..f86807ca4 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -5,6 +5,7 @@ openssh (1:4.1p1-7) UNRELEASED; urgency=low | |||
5 | * Work around the ssh-askpass alternative somehow ending up in manual mode | 5 | * Work around the ssh-askpass alternative somehow ending up in manual mode |
6 | pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass. | 6 | pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass. |
7 | * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113). | 7 | * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113). |
8 | * Fix XSIish uses of 'test' in openssh-server.preinst. | ||
8 | 9 | ||
9 | -- Colin Watson <cjwatson@debian.org> Sat, 9 Jul 2005 23:59:38 +0100 | 10 | -- Colin Watson <cjwatson@debian.org> Sat, 9 Jul 2005 23:59:38 +0100 |
10 | 11 | ||
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst index 1ae85c7e8..412e51564 100644 --- a/debian/openssh-server.preinst +++ b/debian/openssh-server.preinst | |||
@@ -3,11 +3,11 @@ | |||
3 | action=$1 | 3 | action=$1 |
4 | version=$2 | 4 | version=$2 |
5 | 5 | ||
6 | if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then | 6 | if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then |
7 | version=1.2.27 | 7 | version=1.2.27 |
8 | fi | 8 | fi |
9 | 9 | ||
10 | if [ "$action" = upgrade -o "$action" = install ] | 10 | if [ "$action" = upgrade ] || [ "$action" = install ] |
11 | then | 11 | then |
12 | # check if debconf is missing | 12 | # check if debconf is missing |
13 | if ! test -f /usr/share/debconf/confmodule | 13 | if ! test -f /usr/share/debconf/confmodule |
@@ -39,7 +39,7 @@ EOF | |||
39 | # work around for missing debconf | 39 | # work around for missing debconf |
40 | db_get() { : ; } | 40 | db_get() { : ; } |
41 | RET=true | 41 | RET=true |
42 | if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then | 42 | if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then |
43 | cp -a /etc/ssh-nonfree /etc/ssh | 43 | cp -a /etc/ssh-nonfree /etc/ssh |
44 | fi | 44 | fi |
45 | else | 45 | else |