Merge remote-tracking branch 'dgit/dgit/experimental'

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 78505974a4bec2323c6fb5331bb10ca91913f72d..92287200fbecc0bef681851a68e4c541ce5ae5c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,27 @@
-dgit (5.5+exp5~) experimental; urgency=medium
+dgit (5.6~) unstable; urgency=medium
 
-  * test suite: gpg-agent workaround: Add more debugging output.
+  * Merge the experimental branch containing the fianl
+    version of the test suite gnupg workarounds.
 
  --
 
-dgit (5.5+exp4) experimental; urgency=medium
+dgit (5.5+exp9) experimental; urgency=medium
 
-  * test suite: Add bc to appropriate test Depends.
+  * test suite: Explicitly start/stop the gnupg agent, around
+    each call to gnupg.  Apropos of #902316 (and #868550).
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 29 Jun 2018 00:46:11 +0100
+  * 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
 
-dgit (5.5+exp3) experimental; urgency=medium
-
-  * Bump changelog entry date.
-
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 16:31:35 +0100
-
-dgit (5.5+exp2) 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 +30,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: