X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=af4893b1eb9d8bc13ace2c638adf1d448bb12d04;hp=c0c45a1c15f83a8867ced611a9c58baefe254bf4;hb=dc2d5ffb3627335e6522ddb7bf526880dc699762;hpb=459926bd714e0136281d99ac0d9f7b3d8c99fe8c

diff --git a/debian/changelog b/debian/changelog
index c0c45a1c..af4893b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,19 @@
 dgit (2.5~) unstable; urgency=medium
 
-  * dgit-maint-merge(7): New tutorial manpage from Sean Whitton.
-  * Test suite bugfixes.
-  * Test suite: Introduce setup/gnupg, to work around #841143
-    and improve performance by amortising gnupg migration cost.
+  Substantive changes:
+  * Do not crash in split brain quilt modes when the two brains are
+    actually identical.  (Eg --quilt=gbp with no patches.)  Closes:#841770.
   * Switch to new archive/ tag format by default, even in
     non-split-brain mode.
-  * Do not crash in split brain quilt modes when the two brains are
-    actually identical.  Closes:#841770.
+  * Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.
+
+  Documentation:
+  * dgit-maint-merge(7): New tutorial manpage from Sean Whitton.
+
+  Test suite:
+  * Introduce setup/gnupg, to help work around gnupg2 bug #841143
+    and improve performance by amortising gnupg migration cost.
+  * Various bugfixes.
 
  --