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

Incorporate NMU

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 7cc73a8d0c3e6f26313af11efdca91796cae4d52..5c57060375307acdcac92d4e6759bb7871afc1d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ chiark-utils (6.1.3~iwj1) unstable; urgency=medium
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 19 Aug 2020 22:36:09 +0100
 
+chiark-utils (6.1.2+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+    - Maintainer has approved this via personal communication.
+  * Bump debhelper compat to 13 (Closes: #965453).
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 21 Jul 2020 08:17:49 -0700
+
 chiark-utils (6.1.2) unstable; urgency=medium
 
   * git-cache-proxy: Recheck gc timestamp after taking lock

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..b1bd38b62a0800a4f6a80c34e21c5acffae52c7e 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+13