From 55b092f4e1b4a3330fa367b6bf1da2fbca419085 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 13 Oct 2016 18:08:47 +0100 Subject: [PATCH] Test suite: Add debhelper (>=8) to test suite's global Depends. Signed-off-by: Ian Jackson --- debian/changelog | 1 + debian/tests/control | 12 ++++++------ debian/tests/control.in | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2a6a218..f36dbbd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -93,6 +93,7 @@ dgit (1.5~~) unstable; urgency=medium as is proper. Closes:#835858. * When generating patch filenames from titles, first transliterate them (lossily) to ascii. Closes:#834807. + * Add debhelper (>=8) to test suite's global Depends. Test suite: * When sbuild fails, do not crash due to sed not finding the log diff --git a/debian/tests/control b/debian/tests/control index 3502dc4e..4971be00 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,27 +1,27 @@ Tests: build-modes-gbp Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, git-buildpackage +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), git-buildpackage Tests: dsd-clone-drs Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8) Restrictions: x-dgit-intree-only x-dgit-git-only Tests: mirror mirror-debnewgit mirror-private Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, rsync +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), rsync Tests: build-modes-sbuild quilt-gbp-build-modes-sbuild Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, sbuild +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), sbuild Restrictions: x-dgit-schroot-build Tests: spelling Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8) Restrictions: x-dgit-git-only Tests: build-modes build-modes-asplit build-modes-gbp-asplit clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gitconfig import-native import-nonnative inarchivecopy mismatches-contents mismatches-dscchanges newtag-clone-nogit oldnewtagalt oldtag-clone-nogit overwrite-chkclog overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8) diff --git a/debian/tests/control.in b/debian/tests/control.in index 1ca22b5b..107c1d1b 100644 --- a/debian/tests/control.in +++ b/debian/tests/control.in @@ -1,2 +1,2 @@ Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8) -- 2.30.2