diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | build-aux/speedo.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | tools/gpgconf.c | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index b972cffa3..c01c0a843 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,7 +99,7 @@ dist-hook: gen-ChangeLog distcheck-hook: set -e; ( \ - pref="#+macro: gnupg21_" ;\ + pref="#+macro: gnupg22_" ;\ reldate="$$(date -u +%Y-%m-%d)" ;\ echo "$${pref}ver $(PACKAGE_VERSION)" ;\ echo "$${pref}date $${reldate}" ;\ diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index f1ec6530b..b1c6ef8b8 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -276,7 +276,7 @@ endif # Version numbers of the released packages gnupg_ver_this = $(shell cat $(topsrc)/VERSION) -gnupg_ver := $(shell awk '$$1=="gnupg21_ver" {print $$2}' swdb.lst) +gnupg_ver := $(shell awk '$$1=="gnupg22_ver" {print $$2}' swdb.lst) libgpg_error_ver := $(shell awk '$$1=="libgpg_error_ver" {print $$2}' swdb.lst) libgpg_error_sha1:= $(shell awk '$$1=="libgpg_error_sha1" {print $$2}' swdb.lst) @@ -1187,7 +1187,7 @@ installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt define MKSWDB_commands - ( pref="#+macro: gnupg21_w32_" ;\ + ( pref="#+macro: gnupg22_w32_" ;\ echo "$${pref}ver $(INST_VERSION)_$(BUILD_DATESTR)" ;\ echo "$${pref}date $(2)" ;\ echo "$${pref}size $$(wc -c <$(1)|awk '{print int($$1/1024)}')k";\ diff --git a/configure.ac b/configure.ac index b52c86d27..33c88d28b 100644 --- a/configure.ac +++ b/configure.ac @@ -49,6 +49,10 @@ m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist)) m4_esyscmd([echo ]mym4_version[>VERSION]) AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org]) +# When changing the SWDB tag please also adjust the hard coded tags in +# build-aux/speedo.mk and Makefile.am +AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg22", [swdb tag for this branch]) + NEED_GPG_ERROR_VERSION=1.24 NEED_LIBGCRYPT_API=1 diff --git a/tools/gpgconf.c b/tools/gpgconf.c index fefa2ff8a..09b2a76e9 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -292,7 +292,7 @@ query_swdb (estream_t out, const char *name, const char *current_version) goto leave; } if (!strcmp (name, "gnupg")) - search_name = "gnupg21"; + search_name = GNUPG_SWDB_TAG; else if (!strcmp (name, "gnupg1")) search_name = "gnupg1"; else |