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

diff --git a/debian/changelog b/debian/changelog
index 75515ee2..7df0140c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,21 @@
-dgit (2.5~) unstable; urgency=medium
+dgit (2.5) unstable; urgency=low
 
-  * 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.
+  * 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.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 23 Oct 2016 13:20:23 +0100
 
 dgit (2.4) unstable; urgency=low