X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=615176b97fbaa6a07749ffa4724fed7235111811;hb=50419637c2d62d5368a52b6ddb3011f6a75b3b0d;hp=34ea9d8af6c15f08f6edba3f3882ff5d0f71a94a;hpb=37913654d58e03354aa4d5a6aa5afb9c5aeca6b7;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 34ea9d8a..615176b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +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.
+  * Test suite: build-mode-*: Check that right .changes comes out.
+
+ --
+
+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 --force-unrepresentable.
+  * 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