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 f9a21f89a054e92444a4b726d13464530f45f79c..f36ae86ac360b7e02aaa10aafaf9b9429946494f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-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
@@ -10,7 +19,7 @@ dgit (2.7~) unstable; urgency=medium
   * 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