From c44eb676b088186cb7b1b4686cb8437efdc8b9cf Mon Sep 17 00:00:00 2001 From: aviau Date: Wed, 27 Jun 2018 13:32:17 -0400 Subject: [PATCH] Combine autodep8 and autopkgtest --- debian/changelog | 6 ++++++ debian/control | 1 + debian/tests/control | 6 ------ debian/tests/control.autodep8 | 8 ++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 debian/tests/control create mode 100644 debian/tests/control.autodep8 diff --git a/debian/changelog b/debian/changelog index 242ea8b1..65560c1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +aptly (1.3.0-6) UNRELEASED; urgency=medium + + * Combine autodep8 and autopkgtest. + + -- Alexandre Viau Wed, 27 Jun 2018 13:30:04 -0400 + aptly (1.3.0-5) unstable; urgency=medium * Fix syntax-error-in-dep5-copyright. diff --git a/debian/control b/debian/control index 36bb6845..b874bca1 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Homepage: http://www.aptly.info Vcs-Git: https://salsa.debian.org/debian/aptly.git Vcs-Browser: https://salsa.debian.org/debian/aptly XS-Go-Import-Path: github.com/aptly-dev/aptly +Testsuite: autopkgtest-pkg-go Package: aptly Architecture: any diff --git a/debian/tests/control b/debian/tests/control deleted file mode 100644 index 1dcc2a40..00000000 --- a/debian/tests/control +++ /dev/null @@ -1,6 +0,0 @@ -Test-Command: /usr/bin/dh_golang_autopkgtest -Depends: @, @builddeps@, dh-golang -Restrictions: allow-stderr - -Test-Command: aptly repo create autopkgtest -Restrictions: allow-stderr diff --git a/debian/tests/control.autodep8 b/debian/tests/control.autodep8 new file mode 100644 index 00000000..677efd68 --- /dev/null +++ b/debian/tests/control.autodep8 @@ -0,0 +1,8 @@ +# This file is an addition to the autodep8 tests. +# +# See autodep8(1): +# > If `debian/tests/control.autodep8` exists, autodep8 +# > will prepend the contents of that file to its own output. + +Test-Command: aptly repo create autopkgtest +Restrictions: allow-stderr