X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=1efb955b9a863e51fc7328715a162fdc230e95aa;hb=8bfb6fbd138a553c99cc0aa5363c97a9ee676de5;hp=7143fe7d5b222cbc6782efd41e20e36fa1e371fe;hpb=64d159f5dd06cbe512cfb534a8391d691b30ec6c;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 7143fe7d..1efb955b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,17 @@ dgit (1.5~~) unstable; urgency=medium
     in the toplevel the same way we treat ones in the toplevel.
   * When automatically generating quilt patch, honour GIT_COMMITTER_DATE
     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.
+  * Make --quilt=gbp the default for dgit gbp-build.
+  * New tag format (for dgit view) archive/debian/VERSION.
 
   Infrastructure:
   * Better error handling in dgit-repos-policy-debian.
@@ -49,6 +60,15 @@ dgit (1.5~~) unstable; urgency=medium
   * When synthesing a commit from a .dsc from the archive, stop
     internal git reset from printing a confusing message about HEAD.
   * Turn off git gc in the private working areas.
+  * Do not fail to do some important quilt processing in some
+    --quilt modes.
+  * Fix two calls to chdir without proper error checking.
+  * Fix a couple of bugs in error reporting.
+  * 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