X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=49e6295986aed01b4d0e886ba5f447c3503ed575;hp=87f86a6dbd4cda88900222caf114fa0ccd4b45a9;hb=f256f9e8d8b1aea49014939dc37c0bb48f261d17;hpb=a76782b4f0c9009a37e62d664b7d9692bd910783

diff --git a/debian/changelog b/debian/changelog
index 87f86a6d..49e62959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+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.