X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=a45d6337af75101586cb7b2bd0016751fa99565d;hp=009e19fb84b0597cbc7ba06d6cfef2ce78552d21;hb=d561b2284c6e988d70794c9871d44c3bb5f0463f;hpb=866feb162b8f7e84039ed80e206c0df0def5f6c5

diff --git a/debian/changelog b/debian/changelog
index 009e19fb..a45d6337 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,83 @@
-dgit (5.2~) unstable; urgency=medium
+dgit (5.7~) unstable; urgency=medium
 
-  * 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.
+  Bugfixes:
+  * dgit update-vcs-git: Honour --package properly.
+
+ --
+
+dgit (5.6) unstable; urgency=medium
+
+  * Merge the experimental branch containing the fianl
+    version of the test suite gnupg workarounds.  Empirically,
+      - The tests now pass (most of the time, at least) in
+        current Debian unstable, whereas 5.5's fail utterly.
+      - There is still occasional lossage.  So when running tests
+        in a loop (eg to test ever commit), it is still good to set
+        DGIT_TEST_RETRY_COUNT=3 (say).
+
+  * test suite: Test that manpages format with only expected warnings.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 01 Jul 2018 00:41:20 +0100
+
+dgit (5.5+exp9) experimental; urgency=medium
+
+  * test suite: Explicitly start/stop the gnupg agent, around
+    each call to gnupg.  Apropos of #902316 (and #868550).
+
+  * Separate changelog entries for the following test attempts
+    in experimental have been elided:
+      dgit (5.5+exp8) experimental; urgency=medium
+      dgit (5.5+exp7) experimental; urgency=medium
+      dgit (5.5+exp6) experimental; urgency=medium
+      dgit (5.5+exp5) experimental; urgency=medium
+      dgit (5.5+exp4) experimental; urgency=medium
+      dgit (5.5+exp3) experimental; urgency=medium
+      dgit (5.5+exp2) experimental; urgency=medium
+      dgit (5.4+exp1) experimental; urgency=medium
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jun 2018 19:03:00 +0100
+
+dgit (5.5) unstable; urgency=medium
+
+  * Add missing comma in debian/control.  Closes:#902578.
+  * dgit(1): Fix a wrong reference to \fp, which should be \fP.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 13:25:21 +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.
 
-  dgit:
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 27 Jun 2018 23:13:42 +0100
+
+dgit (5.3) unstable; urgency=medium
+
+  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
@@ -21,20 +92,31 @@ dgit (5.2~) unstable; urgency=medium
   * --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.
-  * git-debrebase interop: Add a missing debugcmd debugging print.
-  * git-debrebase interop: Actually tolerate git-debrebase make-patches
-    exiting with status 7.
+
+  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