Merge tag 'debian/9.7' into buster-bpo

dgit release 9.7 for unstable (sid) [dgit]

[dgit distro=debian no-split]

# gpg: Signature made Sun 11 Aug 2019 01:11:36 AM BST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

diff --cc debian/changelog
index e1523466c2809e7770b3cc5fd4827183d401f870,742d92f39514e0fc2fb900168650cf5b5d4bb2b8..b88d2846cb4a58ec3fd1e8085fba45d05fe6673e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,31 +1,37 @@@
+ dgit (9.7) unstable; urgency=medium
+ 
+   dgit general bugfixes:
+   * Correctly test for presence of git repo on dgit git server.
+     Fixes behaviour following mixed dgit/non-dgit uploads.  Closes:#934126.
+     (Was badly broken by http fetching rework in dgit 9.6.)
+   * Fix use on NFS, by closing a file which is going to be deleted.
+     [Report and fix from Stéphane Glondu]  Closes:#933827.
+ 
+   dgit vcs-git bugfixes:
+   * Strip [<path>] (used eg by Debian Haskell Team).  Closes:#932699.
+   * update-vcs-git: Cope if url is unchanged.
+   * update-vcs-git: Strip -b (as it always should have done).
+ 
+   Test suite:
+   * New facilities for http testing, including mock webservers.
+   * New test cases for http, and for bugs fixed in this version.
+   * Switch to using http git check in three existing tests.
+   * Improve debian/tests/control generator.
+   * Limited refactoring to support other changes.
+ 
+   Other minor changes:
+   * dgit: Slightly more debugging for check_for_git with http[s]
+   * changelog: Fix a typo in the entry for 9.6.
+   * i18n (messages) updated, following message changes.
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 11 Aug 2019 01:11:01 +0100
+ 
 +dgit (9.6~bpo10+1) buster-backports; urgency=medium
 +
 +  * Rebuild for buster-backports.
 +
 + -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 27 Jul 2019 07:37:49 +0100
 +
  dgit (9.6) unstable; urgency=medium
  
    * git-playtree-setup had a spurious set -x so many programs spewed