X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=706092bd6113f2d1a64e8703ffb25ef48ca88b93;hb=e2a26e6964e16478866a7503cb50f0f45ab8898e;hp=75515ee2577ea771e7f492228151f2289e045994;hpb=19669291927ee91dbea3c47a412161b32859df88;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 75515ee2..706092bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +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.
 
+  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.
+
  --
 
 dgit (2.4) unstable; urgency=low