default config: Switch to new archive/ tag format

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 252ff7c360f4f322bfd4b958acca407ee9d2d6fa..75515ee2577ea771e7f492228151f2289e045994 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,32 @@
-dgit (2.4~) unstable; urgency=low
+dgit (2.5~) unstable; urgency=medium
 
-  * dgit gbp-build: No longer invent a --git-debian-branch option.
-    Usually the user is a maintainer using split brain, and we should rely
-    on their own gbp configuration to specify the right check.
-    Closes:#841100.
+  * 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.
+  * Switch to new archive/ tag format by default, even in
+    non-split-brain mode.
+
+ --
+
+dgit (2.4) unstable; urgency=low
+
+  Bugfixes:
   * split brain cache: Fix a wrong implicit reference to $_.
     Closes:#841383.
   * split brain cache: Make sure to write reflog entries for cache updates
     even if the eventual tree (and therefore commit) is the same.
     Otherwise, after updating dgit, the cache might have the right answer
     but not be refreshed even by a build.
+  * dgit gbp-build: No longer invent a --git-debian-branch option.
+    Usually the user is a maintainer using split brain, and we should rely
+    on their own gbp configuration to specify the right check.
+    Closes:#841100.
+
+  Minor docs fix:
   * dgit(1): Document which --ch: options are a good idea.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 20 Oct 2016 16:31:54 +0100
 
 dgit (2.3) unstable; urgency=low