build changes handling: Run mergechanges when needed in non-sbuild build modes

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7df0140cdb3d7e8a42d6d7722c00ec16559acf52..f36ae86ac360b7e02aaa10aafaf9b9429946494f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+dgit (2.8~) unstable; urgency=low
+
+  * absurd git-apply fallback: defend against debian/patches/series
+    being an unusual object, in case dpkg-source doesn't.
+  * When in split build mode for `gbp-build' or `build', run
+    mergechanges as is required.  Closes:#841990.
+
+ --
+
+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.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 24 Oct 2016 02:37:28 +0100
+
+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: