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

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 8ee196ca5ec038a669eb74869e1dab8db8c12910..92287200fbecc0bef681851a68e4c541ce5ae5c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,34 @@
-dgit (5.5~) unstable; urgency=medium
+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.
+  * dgit(1): Fix a wrong reference to \fp, which should be \fP.
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 13:18:56 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 13:25:21 +0100
 
 dgit (5.4) unstable; urgency=medium