From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 28 Jun 2018 15:02:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'dgit/dgit/sid' into experimental
X-Git-Tag: archive/debian/5.5+exp2^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a0e481f58a8d70a2a87d59e3e3eda0c32f4c99d2

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

a0e481f58a8d70a2a87d59e3e3eda0c32f4c99d2
diff --cc debian/changelog
index fc26e977,87f86a6d..0f36987b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,22 @@@
- dgit (5.4+exp2) experimental; urgency=medium
++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
 +
+ 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: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: