From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 11 Feb 2020 16:40:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'dgit/dgit/sid'
X-Git-Tag: archive/debian/6.1.1^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=e7854c9af4444f04e516ca85560ce89ad351f6dd

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

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

e7854c9af4444f04e516ca85560ce89ad351f6dd
diff --cc debian/changelog
index fdb5b1c,30436e6..50bb9a2
--- a/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.