X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=debian%2Fchangelog;h=c7e7cc6b5f9194eb0b81ead2bdc1554878222c2a;hb=8eba9566df60aa1f8f494b8947d2cf68a646c7d9;hp=34ea9d8af6c15f08f6edba3f3882ff5d0f71a94a;hpb=37913654d58e03354aa4d5a6aa5afb9c5aeca6b7;p=dgit.git diff --git a/debian/changelog b/debian/changelog index 34ea9d8a..c7e7cc6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,33 @@ -dgit (2.7~) unstable; urgency=medium +dgit (2.9~) unstable; urgency=low + * + + -- + +dgit (2.8) unstable; urgency=medium + + * 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 + (detects #841990). + * Defend against debian/patches/series being an unusual object, in case + dpkg-source doesn't, in absurd git-apply fallback. + + -- Ian Jackson Tue, 25 Oct 2016 17:29:23 +0100 + +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 Mon, 24 Oct 2016 02:37:28 +0100 dgit (2.6) unstable; urgency=medium