Merge tag 'debian/6.11' into stretch-bpo

dgit release 6.11 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Sun 26 Aug 2018 01:58:34 PM MST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

2 files changed, 21 insertions, 0 deletions

diff --git a/tests/tstunt/debchange b/tests/tstunt/debchange
new file mode 100755
index 0000000..452b8c9
--- /dev/null
+++ b/tests/tstunt/debchange
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+spec=$(date --rfc-3339=seconds -d @"${GIT_AUTHOR_DATE% *}")
+spec=${spec%+*}
+
+# The nonsense with TZ is to work around #907264
+tz_set=${TZ+set}
+if ! test "$tz_set"; then tz_undef=-u; fi
+
+set -x
+
+exec \
+env TZ=UTC \
+faketime -f "$spec" \
+env $tz_undef TZ${tz_set:+=}"$TZ" \
+"${DGIT_TEST_REAL_DEBCHANGE-debchange}" "$@"
diff --git a/tests/tstunt/dpkg-deb b/tests/tstunt/dpkg-deb
new file mode 100755
index 0000000..acaadf4
--- /dev/null
+++ b/tests/tstunt/dpkg-deb
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -x
+exec \
+"${DGIT_TEST_REAL_DPKG_DEB}" -Znone "$@"