X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=e97cb3c1a644eb88b7e908bfe97a49a82ae5fbaf;hb=9690891716a743f736f3a745363290cfb64910a9;hp=a55ee20d547ad4d7ff05e00a13175af35a97ad31;hpb=9d91e25a38b64bce53bc315b2f69f1f99e4c1ef3;p=dgit.git diff --git a/debian/changelog b/debian/changelog index a55ee20d..e97cb3c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,13 @@ dgit (1.5~~) unstable; urgency=medium for filename creation (makes filename deterministic in test suite). * New --overwrite option, replaces need to for user to use git merge -s ours. Closes:#838718. + * When generating quilt patches from git commits, make patches that + look quite like git-format-patch output (rather than strange things + based on an obselete interpretation of DEP-3). + * When generating quilt patches from git commits, honour (and strip) + any Gbp-Pq headers (that we understand). + * Several dgit-generated commits now have slightly better annotations + from dgit about what it was doing. Infrastructure: * Better error handling in dgit-repos-policy-debian. @@ -58,6 +65,8 @@ dgit (1.5~~) unstable; urgency=medium * Fix up .orig detection to be less trustful of (ambiguous) filenames. * Fix up .orig detection to correctly allow exactly the right .orig-comp components accorging to dpkg-source(1). + * Fix up .orig detection to handle .asc's (and other signatures) + of .orig components the same way as their tarballs. Test suite: * When sbuild fails, do not crash due to sed not finding the log