diff options
author | Colin Watson <cjwatson@debian.org> | 2012-10-31 10:35:38 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-10-31 10:35:38 +0000 |
commit | 301aad188299b268452af6b67261336c88f44ab1 (patch) | |
tree | 5ec34d429196f17ea6eb2205ca8f96da32b09dd1 /debian/changelog | |
parent | 5cb249b209c170d817471b575b6d105094f137bc (diff) |
* Merge from Ubuntu:
- Add support for registering ConsoleKit sessions on login. (This is
currently enabled only when building for Ubuntu.)
Diffstat (limited to 'debian/changelog')
-rw-r--r-- | debian/changelog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index eb94dd09f..2c137c99b 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,6 +1,9 @@ | |||
1 | openssh (1:6.1p1-2) UNRELEASED; urgency=low | 1 | openssh (1:6.1p1-2) UNRELEASED; urgency=low |
2 | 2 | ||
3 | * Use xz compression for binary packages. | 3 | * Use xz compression for binary packages. |
4 | * Merge from Ubuntu: | ||
5 | - Add support for registering ConsoleKit sessions on login. (This is | ||
6 | currently enabled only when building for Ubuntu.) | ||
4 | 7 | ||
5 | -- Colin Watson <cjwatson@debian.org> Fri, 28 Sep 2012 17:54:42 +0100 | 8 | -- Colin Watson <cjwatson@debian.org> Fri, 28 Sep 2012 17:54:42 +0100 |
6 | 9 | ||