Merge tag 'debian/8.5' into stretch-bpo

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

# gpg: Signature made Mon 27 May 2019 12:24:02 AM BST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Good signature from "Ian Jackson (new general purpose key) <ijackson@chiark.greenend.org.uk>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 559A E46C 2D6B 6D32 65E7  CBA1 E3E3 3923 48B5 0D39

2 files changed, 33 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index d61ec59..cb82895 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+dgit (8.5) unstable; urgency=medium
+
+  * Replace `confess $!' with `confess "$!"', to actually print errno
+    when crashing.  Closes:#929549.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 27 May 2019 00:20:58 +0100
+
+dgit (8.4) unstable; urgency=medium
+
+  Bugfixes:
+  * dgit: import-dsc: Handle relative symlinks correctly.
+    Closes:#913259.
+  * dgit: Do not misrecognise some initial packaging as
+    gdr-compatible.  Closes:#922446.  [Report from Sean Whitton]
+  * git-debrebase: convert-*: Fix two broken error messages.
+    Closes:#922462.  [Report from Didier 'OdyX' Raboud]
+
+  Documentation:
+  * [nl] translations updated.  Closes:#921088.  [Frans Spiesschaert]
+  * Many manpage typo fixes.  Closes:#918384.  [Paul Hardy]
+  * dgit(1): Write the leading dash of an option as '\-'.
+    Closes:#921965.  [Bjarni Ingi Gislason]
+
+  Test suite:
+  * dgit: import-dsc: New test for abs/rel dsc component links
+
+  Internal changes:
+  * dgit: cmd_import_dsc: comment on lack of is_orig_file check
+  * git-debrebase: resolve_upstream_version: Return $used too
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 01 Mar 2019 21:53:40 +0000
+
 dgit (8.3~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.
diff --git a/debian/tests/control b/debian/tests/control
index 6559071..7f0a908 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -68,7 +68,7 @@ Tests: trustingpolicy-replay
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, dput-ng
 
-Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush sourceonlypolicy tag-updates unrepresentable version-opt
+Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush sourceonlypolicy tag-updates unrepresentable version-opt
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime