summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/control8
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index d17acaa53..63b80dbc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
1openssh (1:4.6p1-5) UNRELEASED; urgency=low 1openssh (1:4.6p1-5) UNRELEASED; urgency=low
2 2
3 * Identify ssh as a metapackage rather than a transitional package. It's
4 still useful as a quick way to install both the client and the server.
3 * debconf template translations: 5 * debconf template translations:
4 - Update Catalan (thanks, Jordà Polo; closes: #431970). 6 - Update Catalan (thanks, Jordà Polo; closes: #431970).
5 7
diff --git a/debian/control b/debian/control
index f89c9bfed..c19d87ee2 100644
--- a/debian/control
+++ b/debian/control
@@ -63,10 +63,10 @@ Package: ssh
63Priority: extra 63Priority: extra
64Architecture: all 64Architecture: all
65Depends: openssh-client, openssh-server 65Depends: openssh-client, openssh-server
66Description: secure shell client and server (transitional package) 66Description: secure shell client and server (metapackage)
67 This is a transitional package depending on both the OpenSSH client and 67 This metapackage is a convenient way to install both the OpenSSH client
68 the OpenSSH server, which are now in separate packages. You may remove 68 and the OpenSSH server. It provides nothing in and of itself, so you
69 it once the upgrade is complete and nothing depends on it. 69 may remove it if nothing depends on it.
70 70
71Package: ssh-krb5 71Package: ssh-krb5
72Priority: extra 72Priority: extra