I an OK with this patch but i think we should warn if debian/upstrem is a file.
Bastien
Le 22 févr. 2014 19:59, "Niels Thykier" <nthykier@moszumanska.debian.org> a écrit :
>
> This is an automated email from the git hooks/post-receive script.
>
> nthykier pushed a commit to branch master
> in repository lintian.
>
> commit 707c175957f1f933425fe5a2eec222f5092304db
> Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
> Date: Fri Feb 21 01:46:03 2014 -0500
>
> Check correct locations for upstream keyring for debian/watch
>
> Closes: 738597
>
> Signed-off-by: Niels Thykier <niels@thykier.net>
> ---
> checks/watch-file.desc | 4 +++-
> checks/watch-file.pm | 3 ++-
> debian/changelog | 3 +++
> t/tests/watch-file-pubkey-missing/desc | 2 +-
> 4 files changed, 9 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/debian/changelog b/debian/changelog
> index 4b56def..c4f40e5 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -13,6 +13,9 @@ lintian (2.5.22) UNRELEASED; urgency=medium
> * checks/watch-file.{desc,pm}:
> + [BR] Allow debian/upstream-signing-key.asc,
> thanks to Nicolas Boulenguez (Closes: #736711).
> + + [NT] Apply patch from Daniel Kahn Gillmor to check for
> + the upstream signing key in debian/upstream. Thanks to
> + Hideki Yamane for the bug report. (Closes: #738597)
>
> * collection/java-info:
> + [NT] Update the conditional using file(1) to cope with
> diff --git a/t/tests/watch-file-pubkey-missing/desc b/t/tests/watch-file-pubkey-missing/desc
> index 02bf7aa..a053b75 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 d/upstream/signing-key.{pgp,asc}
> Test-For: debian-watch-file-pubkey-file-is-missing
>
> --
> Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
>