--- checks/watch-file.desc | 4 +++- checks/watch-file.pm | 3 ++- t/tests/watch-file-pubkey-missing/desc | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/checks/watch-file.desc b/checks/watch-file.desc index 668169e..86a0960 100644 --- a/checks/watch-file.desc +++ b/checks/watch-file.desc @@ -164,7 +164,9 @@ Ref: uscan(1) Info: This watch file verifies a cryptographic signature but the upstream public key is missing. . - Please add upstream public keys in debian/upstream-signing-key.asc. + Please add upstream public keys in either + debian/upstream/signing-key.asc or + debian/upstream/signing-key.pgp. Tag: debian-watch-contains-dh_make-template Severity: wishlist diff --git a/checks/watch-file.pm b/checks/watch-file.pm index 59c26b3..8d2259e 100644 --- a/checks/watch-file.pm +++ b/checks/watch-file.pm @@ -183,7 +183,8 @@ sub run { if ($withgpgverification) { if ( !-f $info->debfiles('upstream-signing-key.pgp') - && !-f $info->debfiles('upstream-signing-key.asc')) { + && !-f $info->debfiles('upstream/signing-key.pgp') + && !-f $info->debfiles('upstream/signing-key.asc')) { tag 'debian-watch-file-pubkey-file-is-missing'; } } diff --git a/t/tests/watch-file-pubkey-missing/desc b/t/tests/watch-file-pubkey-missing/desc index 02bf7aa..52f8477 100644 --- a/t/tests/watch-file-pubkey-missing/desc +++ b/t/tests/watch-file-pubkey-missing/desc @@ -2,5 +2,5 @@ Testname: watch-file-pubkey-missing Sequence: 6000 Type: non-native Version: 1+dfsg-1 -Description: Watch file if verify signature should check debian/upstream-signing-key.pgp +Description: Watch file if verify signature should check debian/upstream/signing-key.{pgp,asc} Test-For: debian-watch-file-pubkey-file-is-missing -- 1.8.5.3 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org