diff -rupN debian-archive-keyring-2017.6/Makefile debian-archive-keyring-2017.6-new/Makefile --- debian-archive-keyring-2017.6/Makefile 2017-09-03 18:52:14.000000000 +0200 +++ debian-archive-keyring-2017.6-new/Makefile 2017-09-07 14:19:31.121453700 +0200 @@ -6,19 +6,19 @@ GPG_OPTIONS := --no-options --no-default build: verify-indices keyrings/debian-archive-keyring.gpg keyrings/debian-archive-removed-keys.gpg verify-results $(TRUSTED-LIST) verify-indices: keyrings/team-members.gpg - gpg ${GPG_OPTIONS} \ + gpg2 ${GPG_OPTIONS} \ --keyring keyrings/team-members.gpg \ --verify active-keys/index.gpg active-keys/index - gpg ${GPG_OPTIONS} \ + gpg2 ${GPG_OPTIONS} \ --keyring keyrings/team-members.gpg \ --verify removed-keys/index.gpg removed-keys/index verify-results: keyrings/team-members.gpg keyrings/debian-archive-keyring.gpg keyrings/debian-archive-removed-keys.gpg - gpg ${GPG_OPTIONS} \ + gpg2 ${GPG_OPTIONS} \ --keyring keyrings/team-members.gpg --verify \ keyrings/debian-archive-keyring.gpg.asc \ keyrings/debian-archive-keyring.gpg - gpg ${GPG_OPTIONS} \ + gpg2 ${GPG_OPTIONS} \ --keyring keyrings/team-members.gpg --verify \ keyrings/debian-archive-removed-keys.gpg.asc \ keyrings/debian-archive-removed-keys.gpg @@ -27,17 +27,17 @@ verify-results: keyrings/team-members.gp keyrings/debian-archive-keyring.gpg: active-keys/index jetring-build -I $@ active-keys - gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp + gpg2 ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp mv -f $@.tmp $@ keyrings/debian-archive-removed-keys.gpg: removed-keys/index jetring-build -I $@ removed-keys - gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp + gpg2 ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp mv -f $@.tmp $@ keyrings/team-members.gpg: team-members/index jetring-build -I $@ team-members - gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp + gpg2 ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp mv -f $@.tmp $@ $(TRUSTED-LIST) :: trusted.gpg/debian-archive-%.gpg : active-keys/add-% active-keys/index @@ -46,7 +46,7 @@ $(TRUSTED-LIST) :: trusted.gpg/debian-ar cp $< $(TMPRING) jetring-build -I $@ $(TMPRING) rm -rf $(TMPRING) - gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp + gpg2 ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp mv -f $@.tmp $@ clean: