summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-30 22:40:02 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-30 22:40:02 +0100
commita300724a321a26770ccf701e0a638c7bfa93fa5c (patch)
treec7d9b316f0c4769cd9d418ca8c5ae48f5e088b7c /debian/changelog
parentf8ba14071c7977a0ea2d8f1882202136b7b88dce (diff)
parent8916ea3e2ca88820e6ad1d0c8823a37221f8ed88 (diff)
Merge remote-tracking branch 'dgit/dgit/experimental'
Conflicts: debian/changelog Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog21
1 files changed, 20 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3b551ec..9228720 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.