X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;fp=debian%2Fchangelog;h=92287200fbecc0bef681851a68e4c541ce5ae5c1;hb=a300724a321a26770ccf701e0a638c7bfa93fa5c;hp=3b551ec92e95f136dd5d48c1ef947b1dec1c0f98;hpb=f8ba14071c7977a0ea2d8f1882202136b7b88dce;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 3b551ec9..92287200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,28 @@
 dgit (5.6~) unstable; urgency=medium
 
-  * 
+  * Merge the experimental branch containing the fianl
+    version of the test suite gnupg workarounds.
 
  --
 
+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.