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

diff --git a/debian/changelog b/debian/changelog
index 706092bd..f9a21f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,33 @@
-dgit (2.5~) unstable; urgency=medium
+dgit (2.7~) unstable; urgency=medium
+
+  Absurd bugfix for serious bug:
+  * Work around `git-apply' problems (eg #841865, #829067) exposed by
+    `gbp pq import' (#841866) by sometimes falling back to an emulation of
+    git-apply in terms of dpkg-source --before-build.  Closes:#841867.
+
+  Minor changes:
+  * dgit(1): Reorder the options, moving more important ones earlier.
+  * dgit(1): Some more info about --deliberately.
+  * Provide various --force-something options.  Please don't use them.
+
+ --
+
+dgit (2.6) unstable; urgency=medium
+
+  Fixes to HTTP handling:
+  * Check for non-2xx HTTP status codes from ftpmaster api server.
+  * Always honour --curl= and --curl:.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 23 Oct 2016 14:57:22 +0100
+
+dgit (2.5) unstable; urgency=low
 
   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.
@@ -14,7 +37,7 @@ dgit (2.5~) unstable; urgency=medium
     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