Merge tag 'debian/9.9' into buster-bpo

dgit release 9.9 for unstable (sid) [dgit]

[dgit distro=debian no-split]

# gpg: Signature made Sat 14 Sep 2019 01:35:57 PM MST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

5 files changed, 90 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index 5764220..ba27f28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,58 @@
+dgit (9.9) unstable; urgency=medium
+
+  Documentation:
+  * dgit-maint-{merge,debrebase}(7): Suggest a better rune.
+    (`git fetch --tags upstream')  Closes:#939679.  [Sean Whitton]
+  * git-debpush(1) minor improvements.  Closes:#935084.  [Sean Whitton]
+  * dgit(1): Fix a typo (found by lintian)
+  * dgit-maint-bpo(7): Mention occasional need for --new.  Closes:#935443.
+  * git-debrebase: Extend extended description for this .deb.
+
+  Infrastructure:
+  * New script dgit-mirror-ssh-wrap suitable for use as restricted
+    command on repos mirror target hosts, and corresponding test.
+
+  Packaging niggles:
+  * control: Add missing dependency on liburl-perl (dgit and tests)
+  * control: Drop redundant Priority field for dgit-infrastruture
+  * control: update Vcs-Git to end in .git
+  * lintian: Override some checks
+  * control: Bump Standards-Version to 4.4.0.0.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 14 Sep 2019 21:34:13 +0100
+
+dgit (9.8) unstable; urgency=medium
+
+  dgit, important bugfixes for bugs introduced in 9.6:
+  * Once again cope with archive skew.  Closes:#935874.
+    [Initial report from Colin Watson]
+  * Follow http[s] redirects again.  Closes:#939564.
+
+  dgit, useful new behaviours and fixes:
+  * Use distro-info-data to resolve unknown suites.  Closes:#931212.
+    [Suggestion from Simon McVittie]
+  * Try to warn about misplacement of dgit options.  Closes:#934807.
+    [Useability report from Félix Sipma]
+  * Fail early when the archive/ tag already exists, ie when version
+    needs to be not reused.  Closes:#935802.
+    [Useability report from IOhannes m zmölnig]
+  * Do not mistakely reject .asc and .sig files with push-source -C.
+    Closes:#939280.  [Report from Simon McVittie]
+
+  docs:
+  * dgit-maint-{merge,debrebase}(7): Suggest git fetch --all --tags
+    as it handles tags better.  [Sean Whitton]  Closes:#939504.
+  * git-debrebase(5): Tiny typo fix.
+  * dgit(1): Some semantic linefeeds (no change to rendered output)
+
+  Supporting changes:
+  * test suite: New test for http mirror and archive skew
+  * test suite: Test already-tagged check
+  * test suite: Add --force-reusing-version to many tests as now needed
+  * Dgit: Minor refactoring of a regexp.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 06 Sep 2019 23:42:15 +0100
+
 dgit (9.7~bpo9+1) buster-backports; urgency=medium
 
   * Rebuild for buster-backports.
diff --git a/debian/control b/debian/control
index 3e82d8d..210c5b7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: dgit
 Section: devel
 Priority: optional
 Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Standards-Version: 3.9.4.0
+Standards-Version: 4.4.0.0
 Build-Depends: debhelper (>= 9), gettext, po4a, tcl
 Testsuite: autopkgtest
-Vcs-Git: https://salsa.debian.org/dgit-team/dgit
+Vcs-Git: https://salsa.debian.org/dgit-team/dgit.git
 Vcs-Browser: https://salsa.debian.org/dgit-team/dgit
 
 Package: dgit
@@ -15,8 +15,9 @@ Depends: perl, libdpkg-perl, git-core, devscripts, dpkg-dev,
          coreutils (>= 8.23-1~),
          libdigest-sha-perl, dput, curl, apt,
          libjson-perl, ca-certificates,
-         libtext-iconv-perl, libtext-glob-perl, libwww-curl-perl
-Recommends: ssh-client
+         libtext-iconv-perl, libtext-glob-perl, libwww-curl-perl,
+         libtext-csv-perl
+Recommends: ssh-client, distro-info-data, liburi-perl
 Suggests: sbuild | pbuilder | cowbuilder
 Architecture: all
 Description: git interoperability with the Debian archive
@@ -36,6 +37,9 @@ Architecture: all
 Description: rebasing git workflow tool for Debian packaging
  git-debrebase is a tool for representing in git, and manipulating,
  Debian packages based on upstream source code.
+ .
+ git-debrebase is an alternative to workflows including git-dpm,
+ gbp pq, and direct use of quilt patches.
 
 Package: git-debpush
 Depends: devscripts, git, gnupg, ${misc:Depends}
@@ -57,7 +61,6 @@ Depends: ${misc:Depends}, perl, git-core, gpgv, chiark-utils-bin,
          liblocale-gettext-perl
 Recommends: dgit
 Architecture: all
-Priority: extra
 Description: dgit server backend infrastructure
  This package contains tools which are useful for setting up a dgit
  git repository server.  You probably want dgit, the client package,
diff --git a/debian/dgit.lintian-overrides b/debian/dgit.lintian-overrides
new file mode 100644
index 0000000..2f7a968
--- /dev/null
+++ b/debian/dgit.lintian-overrides
@@ -0,0 +1,2 @@
+manpage-has-errors-from-man usr/share/man/man1/dgit.1.gz file '<standard input>', around line 51:
+binary-without-manpage usr/bin/dgit-badcommit-fixup
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..26924a1
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,4 @@
+file-contains-trailing-whitespace debian/changelog *
+unknown-runtime-tests-restriction x-dgit-*
+missing-debian-source-format
+older-source-format 1.0
diff --git a/debian/tests/control b/debian/tests/control
index 731600b..46ee740 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,32 +1,32 @@
 Tests: baredebian-multitar baredebian-plusgit baredebian-push baredebian-tarball
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, quilt, git-debrebase, git-buildpackage, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, quilt, git-debrebase, git-buildpackage, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl
 
 Tests: build-modes-gbp
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-buildpackage
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-buildpackage
 
 Tests: clone-reprepro downstream-gitless
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, reprepro
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, reprepro
 
 Tests: dpkgsourceignores-docs
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl
 Restrictions: x-dgit-intree-only
 
 Tests: defdistro-dsd-clone-drs dsd-clone-drs
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
-Tests: alternating-dgit clone-gitnosuite clone-nogit drs-clone-nogit dsd-clone-nogit ftpmasterapi-http
+Tests: alternating-dgit clone-gitnosuite clone-nogit clone-skew drs-clone-nogit dsd-clone-nogit ftpmasterapi-http
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, libhttp-server-simple-static-perl
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, libhttp-server-simple-static-perl
 
 Tests: gdr-import-dgit
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debrebase, git-buildpackage, libhttp-server-simple-static-perl
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debrebase, git-buildpackage, libhttp-server-simple-static-perl
 
 Tests: gdr-merge-conflicts
 Tests-Directory: tests/tests
@@ -34,11 +34,11 @@ Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage, quilt
 
 Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debrebase, git-buildpackage
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debrebase, git-buildpackage
 
 Tests: gitattributes
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, bsdgames, man-db, git-man
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, bsdgames, man-db, git-man
 
 Tests: hint-testsuite-triggers
 Tests-Directory: tests/tests
@@ -51,42 +51,42 @@ Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage
 
 Tests: manpages-format
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, man-db, make, groff, git-debrebase, git-debpush
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, man-db, make, groff, git-debrebase, git-debpush
 
 Tests: defdistro-mirror mirror mirror-debnewgit mirror-private
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, rsync
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, rsync
 
 Tests: build-modes-sbuild quilt-gbp-build-modes-sbuild
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, sbuild
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, sbuild
 Restrictions: x-dgit-schroot-build
 
 Tests: sbuild-gitish
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, sbuild, man-db
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, sbuild, man-db
 Restrictions: x-dgit-schroot-build
 
 Tests: i18n-po4a-uptodate package-build spelling
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl
 Restrictions: x-dgit-git-only
 
 Tests: tagupl
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl, git-debpush
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl, git-debpush
 
 Tests: tagupl-baredebian
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, quilt, git-debpush, git-debrebase, git-buildpackage, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, quilt, git-debpush, git-debrebase, git-buildpackage, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl
 
 Tests: tagupl-gbp
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debpush, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl
 
 Tests: tagupl-native
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debpush
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush
 
 Tests: test-list-uptodate
 Tests-Directory: tests/tests
@@ -94,9 +94,9 @@ Depends: git
 
 Tests: trustingpolicy-replay
 Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, dput-ng
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, dput-ng
 
 Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp debpolicy-taintrm defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-push-masterupdate drs-push-rejects dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite 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 rpush-quilt 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
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl