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

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

diff --cc debian/changelog
index fdb5b1ca099bf5f216c192f7018573bc6d6e174a,30436e61ff78d159b0d4768f7d43eb388764c096..50bb9a21d9229283b26d6db44f60ae7c0148467c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,14 +1,36 @@@
 +chiark-utils (6.1.1) unstable; urgency=medium
 +
 +  * fishdescriptor: Use Python "errno" module
 +  * git-cache-proxy: Periodically run `git gc --quiet'
 +  * git-cache-proxy: Document some options in the head comment
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 11 Feb 2020 16:37:31 +0000
 +
 +chiark-utils (6.0.5~citrix1) unstable; urgency=medium
 +
 +  * fishdescriptor: Use Python "errno" module, not "os.errno"
 +    (which is not in modern python3 apparently).
 +
 + -- Ian Jackson <ian.jackson@citrix.com>  Fri, 20 Dec 2019 17:50:02 +0000
 +
 +chiark-utils (6.1.0~iwj1) unstable; urgency=medium
 +
 +  * really: Writeability of rc.local suffices, too.
 +    (Non-sysvinit compatibility.)
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 12 Aug 2019 10:59:02 +0100
 +
+ chiark-utils (6.1.0) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+     - Maintainer has approved this via personal communication.
+   * git-branchmove: rewrite in perl (Closes: #914398, #914399)
+     - Add dependencies on libgit-wrapper-perl, libtry-tiny-perl to
+       bin:chiark-scripts.
+   * git-branchmove: new --detach feature.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 07 Dec 2019 14:10:26 -0700
+ 
  chiark-utils (6.0.4) unstable; urgency=medium
  
    * sync-accounts: Fix perl syntax error.  Closes:#865985.