X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=f36ae86ac360b7e02aaa10aafaf9b9429946494f;hb=69c8de09ff5cb507a7628282d346c2c8fd487a86;hp=f8077a9d1a357c7730f02efb9297348b6ab23dbb;hpb=222e0d86885e87c80659eae325a17a0fb7ad06f9;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index f8077a9d..f36ae86a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,26 @@
-dgit (2.7~) unstable; urgency=medium
+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: