Merge tag 'debian/6.2' into stretch-bpo

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

# gpg: Signature made Sun 29 Jul 2018 08:02:30 PM CST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

4 files changed, 71 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 870e0c0..f5498ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,70 @@
+dgit (6.2) unstable; urgency=medium
+
+  * dgit(1): Improve and correct --build-products-dir description.
+  * dgit: Minor code cleanup.
+  * dgit build: Warn if --build-products-dir is not `..'.  Closes:#904859.
+  * test suite: Test dgit import-dsc --build-products-dir.
+
+  [Sean Whitton]
+  * manpages: alioth->salsa
+  * manpages: add references to pbuilder and cowbuilder
+  * dgit-maint-gbp(7): discuss dgit.default.build-products-dir
+  * dgit-maint-gbp(7): update references to --*-dirty
+  * dgit-sponsorship(7): add references to push-source
+  * dgit-maint-debrebase(7): fix command to just launder
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 29 Jul 2018 12:57:26 +0100
+
+dgit (6.1) unstable; urgency=medium
+
+  New feature:
+  * 'pbuilder' and 'cowbuilder' subcommands (Closes: #844125).
+    - Suggest sbuild | pbuilder | cowbuilder.
+
+  Minor fixes:
+  * Fix an error message to refer to the build products dir instead of
+    just the parent directory.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 28 Jul 2018 20:14:23 +0800
+
+dgit (6.0) unstable; urgency=medium
+
+  New features [Sean Whitton]:
+  * Introduce dgit.default.build-products-dir git configuration key.
+    Closes:#857316.
+  * Die earlier, and with a more helpful message, if the user tries to
+    include dirty changes when building a source package in split brain
+    mode.
+
+  dgit behavioural changes:
+  * dgit: Always build the source package ourselves, rather than
+    sometimes leaving that to the builder command.  dgit will now
+    usually generate *_multi.changes rather than *_$arch.changes.
+  * dgit: Build source packages in a private directory, except when
+    the user passes --include-dirty [Sean Whitton].
+    - dgit push-source no longer cleans the tree [Sean Whitton].
+  * dgit: Rename --ignore-dirty to --include-dirty (leaving the old
+    name supported as a deprecated alias).
+
+  Test suite improvements:
+  * test suite: unset VISUAL, which interferes.  Closes:#904308.
+  * Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the sbuild
+    tests.
+  * Support tests/run-all --progressive.
+  * Drop now-obsolete *-asplit tests.
+
+  Other improvements:
+  * apt-get method: when apt does not update release files,
+    unconditionally print hint about noatime.  Closes:#851873.
+  * messages: Be a lot more friendly about NEW in particular,
+    and also add a couple of `please's.  Closes:#904448.
+  * Make --build-products-dir (and the new config key) actually work.
+    Closes:#863582.  [ Ian and Sean. ] 
+  * dgit: Many important internal rearrangemnts relating to source
+    package production and building.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 26 Jul 2018 14:43:47 +0100
+
 dgit (5.10~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.
diff --git a/debian/control b/debian/control
index 3fca347..a36b357 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Depends: perl, libwww-perl, libdpkg-perl, git-core, devscripts, dpkg-dev,
          libjson-perl, ca-certificates,
          libtext-iconv-perl, libtext-glob-perl
 Recommends: ssh-client
-Suggests: sbuild
+Suggests: sbuild | pbuilder | cowbuilder
 Architecture: all
 Description: git interoperability with the Debian archive
  dgit (with the associated infrastructure) makes it possible to
diff --git a/debian/copyright b/debian/copyright
index 740bafa..c5b10a1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 dgit
 Integration between git and Debian-style archives
 
-Copyright (C)2013-2017 Ian Jackson
-Copyright (C)2016-2017 Sean Whitton
+Copyright (C)2013-2018 Ian Jackson
+Copyright (C)2016-2018 Sean Whitton
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/debian/tests/control b/debian/tests/control
index dfd73bb..8480655 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -60,7 +60,7 @@ Tests: trustingpolicy-replay
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, dput-ng
 
-Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit 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 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 test-list-uptodate unrepresentable version-opt
+Tests: absurd-gitapply badcommit-rewrite build-modes 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 test-list-uptodate unrepresentable version-opt
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc