changelog: Organise for 2.9

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 15215e178b50ff6fe55ecdcaea24a54d8defc5a2..9be0e98fdb47104dbbb1d75cdd8a56a2300a2aeb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,9 @@
 dgit (2.9~) unstable; urgency=medium
 
-  * Split brain mode: Fix --new.  Closes:#842577.
+  New features:
   * During push, automatically calculate which .origs are required,
     so user never needs [--ch:]-sa or [--ch:]-sd.  Closes:#829116.
-  * Properly look for .origs etc. in .., fetching them less often.
-    Closes:#842386.
   * New import-dsc feature.
-  * Test suite: Explicitly configure user.name and user.email, so
-    that tests work when environment doesn't have defaults.
-    Closes:#842279 (I hope).
   * New option --dgit-view-save= for split view quilt modes.
     In particular, means that the output of a split view quilt-fixup
     is left somewhere useful.
@@ -19,13 +14,8 @@ dgit (2.9~) unstable; urgency=medium
     about possible skew).
   * dgit gbp-build will arrange to let gbp buildpackage generate
     .orig tarballs if it seems applicable.  Closes:#841094.
-  * Reject `dgit pull' in split view quilt modes, to avoid
-    creating unfortunate wreckage on non-dgit-view branches.
-    Closes:#842608.
-  * Cope when cloning suite which doesn't receive uploads,
-    like testing.  Closes:#842621.
-  * Properly fetch all archive dgit view tags, as we intended.
-  * Actually provide a -p (--package=) option (!)
+
+  Documentation improvements:
   * dgit-*(7).  Many new tutorial manpages, several written and many
     improved by Sean Whitton.
   * dgit(7): Substantial updates, including documenting split view.
@@ -35,6 +25,23 @@ dgit (2.9~) unstable; urgency=medium
   * Fix changelog entry for SIGPIPE to correctly mention
     Closes:#841090.
 
+  Bugfixes:
+  * Split brain mode: Fix --new.  Closes:#842577.
+  * Properly look for .origs etc. in .., fetching them less often.
+    Closes:#842386.
+  * Reject `dgit pull' in split view quilt modes, to avoid
+    creating unfortunate wreckage on non-dgit-view branches.
+    Closes:#842608.
+  * Cope when cloning suite which doesn't receive uploads,
+    like testing.  Closes:#842621.
+  * Properly fetch all archive dgit view tags, as we intended.
+  * Actually provide a -p (--package=) option (!)
+
+  Test suite fixes:
+  * Test suite: Explicitly configure user.name and user.email, so
+    that tests work when environment doesn't have defaults.
+    Closes:#842279 (I hope).
+
  --
 
 dgit (2.8) unstable; urgency=medium