X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=51748225018ee1a489e42c32a66020728899ac35;hb=96a93d8f6efbf26925d3644f10520e9320066b16;hp=78505974a4bec2323c6fb5331bb10ca91913f72d;hpb=7d0d834d7b41b5f3cafffc37b9a9d94966c68e0f;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 78505974..51748225 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,40 @@
-dgit (5.5+exp5~) experimental; urgency=medium
+dgit (5.7~) unstable; urgency=medium
 
-  * test suite: gpg-agent workaround: Add more debugging output.
+  * 
 
  --
 
-dgit (5.5+exp4) experimental; urgency=medium
+dgit (5.6) unstable; urgency=medium
 
-  * test suite: Add bc to appropriate test Depends.
+  * 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).
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 29 Jun 2018 00:46:11 +0100
+  * test suite: Test that manpages format with only expected warnings.
 
-dgit (5.5+exp3) experimental; urgency=medium
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 01 Jul 2018 00:41:20 +0100
 
-  * Bump changelog entry date.
+dgit (5.5+exp9) experimental; urgency=medium
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 16:31:35 +0100
+  * test suite: Explicitly start/stop the gnupg agent, around
+    each call to gnupg.  Apropos of #902316 (and #868550).
 
-dgit (5.5+exp2) experimental; urgency=medium
+  * 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
 
-  * test suite: Explicit agent starting/stopping
-
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 00:42:00 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jun 2018 19:03:00 +0100
 
 dgit (5.5) unstable; urgency=medium
 
@@ -29,12 +43,6 @@ dgit (5.5) unstable; urgency=medium
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 13:25:21 +0100
 
-dgit (5.4+exp1) experimental; urgency=medium
-
-  * 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: