X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=706092bd6113f2d1a64e8703ffb25ef48ca88b93;hp=1ef8ebd42bbe543d9e437eb05643dbb468137278;hb=e2a26e6964e16478866a7503cb50f0f45ab8898e;hpb=70dbab26df688289afccf257188267afb3594d16

diff --git a/debian/changelog b/debian/changelog
index 1ef8ebd4..706092bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+dgit (2.5~) unstable; urgency=medium
+
+  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
 
   Bugfixes: