summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-22 00:23:29 +0100
committerColin Watson <cjwatson@debian.org>2013-05-22 00:23:29 +0100
commit201b985b6442b39c14a0d97decf626af1100b31b (patch)
tree4141eb54482ccc0951fddc29c86f8d0a1b5c654e
parent66226af6929845dbe14a477e87237950a690b918 (diff)
Clarify changelog: upgrades -> direct upgrades.
-rw-r--r--debian/changelog16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 72391730e..7e32bad3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,17 +6,17 @@ openssh (1:6.2p2-2) UNRELEASED; urgency=low
6 is not really necessary since one of static-network-up and failsafe-boot 6 is not really necessary since one of static-network-up and failsafe-boot
7 is guaranteed to happen and will trigger entry to the default runlevel, 7 is guaranteed to happen and will trigger entry to the default runlevel,
8 and we don't care about ssh starting before the network (LP: #1098299). 8 and we don't care about ssh starting before the network (LP: #1098299).
9 * Drop conffile handling for upgrades from pre-split ssh package; this was 9 * Drop conffile handling for direct upgrades from pre-split ssh package;
10 originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a truly ghastly 10 this was originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a
11 hack around a misbehaviour in sarge's dpkg. Since this is now four 11 truly ghastly hack around a misbehaviour in sarge's dpkg. Since this is
12 Debian releases ago, we can afford to drop this and simplify the 12 now four Debian releases ago, we can afford to drop this and simplify
13 packaging. 13 the packaging.
14 * Remove ssh/use_old_init_script, which was a workaround for a very old 14 * Remove ssh/use_old_init_script, which was a workaround for a very old
15 bug in /etc/init.d/ssh. If anyone has ignored this for >10 years then 15 bug in /etc/init.d/ssh. If anyone has ignored this for >10 years then
16 they aren't going to be convinced now. 16 they aren't going to be convinced now.
17 * Remove support for upgrading from ssh-nonfree. 17 * Remove support for upgrading directly from ssh-nonfree.
18 * Remove lots of maintainer script support for upgrades from pre-etch 18 * Remove lots of maintainer script support for direct upgrades from
19 (three releases before current stable). 19 pre-etch (three releases before current stable).
20 20
21 -- Colin Watson <cjwatson@debian.org> Tue, 21 May 2013 17:49:35 +0100 21 -- Colin Watson <cjwatson@debian.org> Tue, 21 May 2013 17:49:35 +0100
22 22