[X2Go-Commits] [x2go-keyring] 01/02: Makefile: switch back to unversioned gpg binary.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2go-keyring.

commit 54888f81fe6e4974b2a7f484464a99ac9616d064
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Aug 17 11:29:10 2019 +0200

    Makefile: switch back to unversioned gpg binary.
    
    Even gnupg1 should be good enough on older system like Jessie.
---
 Makefile         | 2 +-
 debian/changelog | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5bae230..c931a1e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ TRUSTED-LIST := $(patsubst active-keys/add-%,trusted.gpg/x2go-archive-%.gpg,$(wi
 TMPRING := trusted.gpg/build-area
 
 GPG_OPTIONS := --no-options --no-default-keyring --no-auto-check-trustdb --trustdb-name ./trustdb.gpg
-GPG := gpg2
+GPG := gpg
 
 build: verify-indices keyrings/x2go-archive-keyring.gpg keyrings/x2go-archive-removed-keys.gpg verify-results $(TRUSTED-LIST)
 
diff --git a/debian/changelog b/debian/changelog
index 7e89794..ff4e935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium
     "gpg2".
   * Makefile: manually try to clean up keyrings via --export | --import if the
     filtering command that uses newer GnuPG 2 syntax fails.
+  * Makefile: switch back to unversioned gpg binary. Even gnupg1 should be
+    good enough on older system like Jessie.
   * debian/control:
     - Change maintainer to the mailing list.
     - Add the old package maintainer to the Uploaders field and myself.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git