diff options
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/control | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 1c81c1387..b24826766 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -3,9 +3,10 @@ openssh (1:3.8.1p1-9) UNRELEASED; urgency=low | |||
3 | * Split the ssh binary package into openssh-client and openssh-server | 3 | * Split the ssh binary package into openssh-client and openssh-server |
4 | (closes: #39741). openssh-server depends on openssh-client for some | 4 | (closes: #39741). openssh-server depends on openssh-client for some |
5 | common functionality; it didn't seem worth creating yet another package | 5 | common functionality; it didn't seem worth creating yet another package |
6 | for this. | 6 | for this. openssh-client is priority standard, openssh-server optional. |
7 | * New transitional ssh package, depending on openssh-client and | 7 | * New transitional ssh package, priority optional, depending on |
8 | openssh-server. May be removed once nothing depends on it. | 8 | openssh-client and openssh-server. May be removed once nothing depends |
9 | on it. | ||
9 | * When upgrading from ssh to openssh-{client,server}, it's very difficult | 10 | * When upgrading from ssh to openssh-{client,server}, it's very difficult |
10 | for the maintainer scripts to find out what version we're upgrading from | 11 | for the maintainer scripts to find out what version we're upgrading from |
11 | without dodgy dpkg hackery. I've therefore taken the opportunity to move | 12 | without dodgy dpkg hackery. I've therefore taken the opportunity to move |
diff --git a/debian/control b/debian/control index d0080e8ec..3fd8b21f9 100644 --- a/debian/control +++ b/debian/control | |||
@@ -34,6 +34,7 @@ Description: Secure shell client, an rlogin/rsh/rcp replacement | |||
34 | without a special permit. | 34 | without a special permit. |
35 | 35 | ||
36 | Package: openssh-server | 36 | Package: openssh-server |
37 | Priority: optional | ||
37 | Architecture: any | 38 | Architecture: any |
38 | Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version}) | 39 | Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version}) |
39 | Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1) | 40 | Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1) |
@@ -61,6 +62,7 @@ Description: Secure shell server, an rshd replacement | |||
61 | without a special permit. | 62 | without a special permit. |
62 | 63 | ||
63 | Package: ssh | 64 | Package: ssh |
65 | Priority: optional | ||
64 | Architecture: all | 66 | Architecture: all |
65 | Depends: openssh-client, openssh-server | 67 | Depends: openssh-client, openssh-server |
66 | Description: Secure shell client and server (transitional package) | 68 | Description: Secure shell client and server (transitional package) |