X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=14fbbebea9f61c446726c95dd5001b6b71578890;hb=de85fd5178bb68f6f98a955654e89241b337df4c;hp=ccb54e68d95f28847fab9cce9482330ed2db5478;hpb=ee6912f5817172bed2d88b6de8ab17ac3d1eb8c0;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index ccb54e68..14fbbebe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,24 @@
-dgit (2.7~) unstable; urgency=medium
+dgit (2.8~) unstable; urgency=low
 
-  * dgit(1): Reorder the options, moving more important ones earlier.
+  * absurd git-apply fallback: defend against debian/patches/series
+    being an unusual object, in case dpkg-source doesn't.
 
  --
 
+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: