reorganise changelog

1 files changed, 28 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index 7978dcfb8..3ec05c070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,13 @@
 openssh (1:4.7p1-11) UNRELEASED; urgency=low
 
-  * Fix typo in ssh/vulnerable_host_keys message (thanks, Esko Arajärvi).
-  * debconf template translations:
-    - Update Finnish (thanks, Esko Arajärvi; closes: #481530).
-    - Update French (thanks, Christian Perrier; closes: #481576).
-    - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #481591).
-    - Update Galician (thanks, Jacobo Tarrio; closes: #481596).
-    - Update Japanese (thanks, Kenshi Muto; closes: #481621).
-    - Update Czech (thanks, Miroslav Kure; closes: #481624).
-    - Update German (thanks, Helge Kreutzmann; closes: #481676).
-    - Update Portuguese (thanks, Ricardo Silva; closes: #481781).
-    - Update Basque (thanks, Piarres Beobide; closes: #481836).
-    - Update Bulgarian (thanks, Damyan Ivanov; closes: #481870).
-    - Update Vietnamese (thanks, Clytie Siddall; closes: #481876).
-    - Update Spanish (thanks, Javier Fernandez-Sanguino Peña; closes:
-      #482341).
-    - Update Turkish (thanks, Mert Dirik; closes: #482548).
-    - Update Russian (thanks, Yuri Kozlov; closes: #482887).
-    - Update Swedish (thanks, Martin Bagge; closes: #482464).
-    - Update Italian (thanks, Luca Monducci; closes: #482808).
+  * Make init script depend on $syslog, and fix some other dependency
+    glitches (thanks, Petter Reinholdtsen; closes: #481018).
+  * Remove 0 and 6 from Default-Stop in init script (thanks, Kel Modderman;
+    closes: #481151).
+  * Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik;
+    closes: #480020).
+  * Allow building with heimdal-dev (LP: #125805).
+
   * Check RSA1 keys without the need for a separate blacklist. Thanks to
     Simon Tatham for the idea.
   * Generate two keys with the PID forced to the same value and test that
@@ -31,12 +20,6 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low
     (thanks, Heiko Schlittermann and Christopher Perry; closes: #481398).
   * Check for blacklists in /usr/share/ssh/ as well as /etc/ssh/ (see
     #481283).
-  * Make init script depend on $syslog, and fix some other dependency
-    glitches (thanks, Petter Reinholdtsen; closes: #481018).
-  * Remove 0 and 6 from Default-Stop in init script (thanks, Kel Modderman;
-    closes: #481151).
-  * Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik;
-    closes: #480020).
   * Log IP addresses of hosts attempting to use blacklisted keys (closes:
     #481721).
   * Incorporate various ssh-vulnkey suggestions from Hugh Daniel:
@@ -49,7 +32,6 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low
       exception of host keys unless -a was given.
     - In verbose mode, output the name of each file examined.
   * Handle leading IP addresses in ssh-vulnkey input (LP: #230497).
-  * Allow building with heimdal-dev (LP: #125805).
   * Fix various ssh-vulnkey problems pointed out by Solar Designer:
     - Fix some buffer handling inconsistencies.
     - Use xasprintf to build user key file names, avoiding truncation
@@ -59,6 +41,26 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low
     - Reword "Unknown (no blacklist information)" to "Unknown (blacklist
       file not installed)".
 
+  * Fix typo in ssh/vulnerable_host_keys message (thanks, Esko Arajärvi).
+  * debconf template translations:
+    - Update Finnish (thanks, Esko Arajärvi; closes: #481530).
+    - Update French (thanks, Christian Perrier; closes: #481576).
+    - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #481591).
+    - Update Galician (thanks, Jacobo Tarrio; closes: #481596).
+    - Update Japanese (thanks, Kenshi Muto; closes: #481621).
+    - Update Czech (thanks, Miroslav Kure; closes: #481624).
+    - Update German (thanks, Helge Kreutzmann; closes: #481676).
+    - Update Portuguese (thanks, Ricardo Silva; closes: #481781).
+    - Update Basque (thanks, Piarres Beobide; closes: #481836).
+    - Update Bulgarian (thanks, Damyan Ivanov; closes: #481870).
+    - Update Vietnamese (thanks, Clytie Siddall; closes: #481876).
+    - Update Spanish (thanks, Javier Fernandez-Sanguino Peña; closes:
+      #482341).
+    - Update Turkish (thanks, Mert Dirik; closes: #482548).
+    - Update Russian (thanks, Yuri Kozlov; closes: #482887).
+    - Update Swedish (thanks, Martin Bagge; closes: #482464).
+    - Update Italian (thanks, Luca Monducci; closes: #482808).
+
  -- Colin Watson <cjwatson@debian.org>  Sat, 17 May 2008 08:48:45 +0200
 
 openssh (1:4.7p1-10) unstable; urgency=low