X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=0e4194ee3be15ea276c8aa0097ce0cdaaadd9dab;hp=3216e4aada2ecd61ce2ae4c29a22d1d7b44b8354;hb=b0b5273947e6927b90e64e90c378865d86321753;hpb=1dd14bbf4f9cb4b6e973aa2813070c0847d71c31

diff --git a/debian/changelog b/debian/changelog
index 3216e4aa..0e4194ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,43 @@
-dgit (5.2~) unstable; urgency=medium
+dgit (5.4+exp1) experimental; urgency=medium
 
-  * dgit(1): Mention under `dgit build' that it uses the network.
+  * No-change upload, for testing.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 00:44:52 +0100
+
+dgit (5.4) unstable; urgency=medium
+
+  Improvements:
+  * dgit(1): Better description of --overwrite.  Somewhat
+    apropos of discussion in #902534.
+
+  Bugfixes:
+  * test suite: gdr-viagit, gdr-newupstream: Do not spuriously
+    fail if gnupg not serendipitously installed.  Closes:#902559.
+  * Fix bug ref to #865444 in previous changelog entry.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 27 Jun 2018 23:13:42 +0100
+
+dgit (5.3) unstable; urgency=medium
 
-  dgit:
+  Bugfixes:
+  * dgit: Do not introduce duplicate origs in .changes files,
+    eg if the .changes already has that orig.  Closes:#869146.
+  * Honour GIT_REFLOG_ACTION everywhere.  Closes:#901935.
+  * git-debrebase new-upstream: Provide better reflog entries
+    by setting GIT_REFLOG_ACTION.  Closes:#901925.
+
+  Improvements:
+  * Better message formatting when --overwrite may be needed,
+    and a note about first dgit push in dgit(1).  Closes:891031.
+  * dgit(7): Add discussion of quilt fixup error messages,
+    and add cross-references to dgit(1) and the actual error.
+    Somewhat apropos of #865444.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 27 Jun 2018 14:00:31 +0100
+
+dgit (5.2) unstable; urgency=medium
+
+  dgit bugfixes:
   * When all Debian changes vanish with single-debian-patch,
     do not fail to commit the patch queue removal.  Closes:#877036.
   * When build fails because the network is offline, mention
@@ -10,8 +45,38 @@ dgit (5.2~) unstable; urgency=medium
     Closes:#883340.
   * When quilt fixup fails because of discrepancies, print a
     git diff rune which will show them.  Closes:#865446.
+  * When fetch or push wants git fetch (other than in a situation where it
+    happes to be a noop) but --dry-run was specified, fail with an
+    explanation, rather than looping with a false coplaint about git
+    fetch.  Closes:#871317.
+  * --overwrite now no longer crashes if there is nothing to overwrite
+    (eg, when used with --new).  Instead, it is simply ignored, as it is
+    ignored in situations where the push is fast forward.  Closes:#863576.
+
+  dgit/git-debrebase interop bugfixes:
+  * git-debrebase interop: Add a missing debugcmd debugging print.
+  * git-debrebase interop: Actually tolerate git-debrebase make-patches
+    exiting with status 7.
+
+  dgit vcs-git handling improvements:
+  * Provide `update-vcs-git' subcommand, for creating and adjusting the
+    vcs-git remote url.  Useful for transition from alioth to salsa.
+    Closes:#902006.
+  * Print a warning to stderr on `dgit fetch sid', if your vcs-git
+    remote url disagrees with what's in sid's .dsc.
+
+  documentation:
+  * dgit(1): Mention under `dgit build' that it uses the network.
+  * dgit(1): Clarify that --overwrite does nothing if not needed.
+    Closes:#863578.
+  * dgit-user(7): Recommend sbuild-debian-developer-setup.
+    [ Sean Whitton. ]  Closes:895779.
+
+  test suite:
+  * Use nproc(1) rather than Sys::CPU.  This is more portable and does not
+    depend on libsys-cpu-perl being installed.  Closes:888496.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 24 Jun 2018 23:33:28 +0100
 
 dgit (5.1) unstable; urgency=medium