diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/control | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index f4bb9d57b..0941e5d15 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,11 @@ | |||
1 | openssh (1:6.1p1-3) UNRELEASED; urgency=low | ||
2 | |||
3 | * Give ssh and ssh-krb5 versioned dependencies on openssh-client and | ||
4 | openssh-server, to try to reduce confusion when people run 'apt-get | ||
5 | install ssh' or similar and expect that to upgrade everything relevant. | ||
6 | |||
7 | -- Colin Watson <cjwatson@debian.org> Wed, 19 Dec 2012 10:50:33 +0000 | ||
8 | |||
1 | openssh (1:6.1p1-2) experimental; urgency=low | 9 | openssh (1:6.1p1-2) experimental; urgency=low |
2 | 10 | ||
3 | * Use xz compression for binary packages. | 11 | * Use xz compression for binary packages. |
diff --git a/debian/control b/debian/control index 600d5c915..3359c8b39 100644 --- a/debian/control +++ b/debian/control | |||
@@ -75,7 +75,7 @@ Description: secure shell (SSH) server, for secure access from remote machines | |||
75 | Package: ssh | 75 | Package: ssh |
76 | Priority: extra | 76 | Priority: extra |
77 | Architecture: all | 77 | Architecture: all |
78 | Depends: ${misc:Depends}, openssh-client, openssh-server | 78 | Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version}) |
79 | Description: secure shell client and server (metapackage) | 79 | Description: secure shell client and server (metapackage) |
80 | This metapackage is a convenient way to install both the OpenSSH client | 80 | This metapackage is a convenient way to install both the OpenSSH client |
81 | and the OpenSSH server. It provides nothing in and of itself, so you | 81 | and the OpenSSH server. It provides nothing in and of itself, so you |
@@ -85,7 +85,7 @@ Package: ssh-krb5 | |||
85 | Section: oldlibs | 85 | Section: oldlibs |
86 | Priority: extra | 86 | Priority: extra |
87 | Architecture: all | 87 | Architecture: all |
88 | Depends: ${misc:Depends}, openssh-client, openssh-server | 88 | Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version}) |
89 | Description: secure shell client and server (transitional package) | 89 | Description: secure shell client and server (transitional package) |
90 | This is a transitional package depending on the regular Debian OpenSSH | 90 | This is a transitional package depending on the regular Debian OpenSSH |
91 | client and server, which now support GSSAPI natively. It will add the | 91 | client and server, which now support GSSAPI natively. It will add the |