diff options
| author | Werner Koch <wk@gnupg.org> | 2024-07-05 12:09:23 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2024-07-05 12:09:23 +0200 |
| commit | 7c4c35f5420e966891937d3fc6c49f4a5ee6d012 (patch) | |
| tree | a7b5d0bd4b40c52cec0b9671e4f9102c3598c98e | |
| parent | gpg: Print a warning if the (draft) Kyber algorithm is used. (diff) | |
| download | gnupg2-7c4c35f5420e966891937d3fc6c49f4a5ee6d012.tar.xz gnupg2-7c4c35f5420e966891937d3fc6c49f4a5ee6d012.zip | |
build: Prepare docs for GnuPG 2.6
--
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | README | 11 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index b6b8a8e9e..c8d551a84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -163,7 +163,7 @@ dist-hook: gen-ChangeLog distcheck-hook: set -e; ( \ - pref="#+macro: gnupg24_" ;\ + pref="#+macro: gnupg26_" ;\ reldate="$$(date -u +%Y-%m-%d)" ;\ echo "$${pref}ver $(PACKAGE_VERSION)" ;\ echo "$${pref}date $${reldate}" ;\ @@ -312,7 +312,7 @@ sign-release: gpg -sbu $$mysignkey $${wixlibfile} ;\ fi; \ cat $(RELEASE_NAME).swdb >swdb.snippet;\ - echo '#+macro: gnupg24_branch STABLE-BRANCH-2-4' >>swdb.snippet;\ + echo '#+macro: gnupg26_branch master' >>swdb.snippet;\ cat $${release_w32_name}.exe.swdb >>swdb.snippet;\ echo >>swdb.snippet ;\ sha1sum $${files1} >>swdb.snippet ;\ @@ -25,9 +25,12 @@ can be freely used, modified and distributed under the terms of the GNU General Public License. + Note that versions 2.5.x are maintained development versions leading + to the forthcoming new stable version 2.6.x. + * BUILD INSTRUCTIONS - GnuPG 2.4 depends on the following GnuPG related packages: + GnuPG 2.6 depends on the following GnuPG related packages: npth (https://gnupg.org/ftp/gcrypt/npth/) libgpg-error (https://gnupg.org/ftp/gcrypt/libgpg-error/) @@ -93,10 +96,10 @@ libraries can be installed into an arbitrary location using for example: - make -f build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24 - ldconfig -n /usr/local/gnupg24/lib + make -f build-aux/speedo.mk install SYSROOT=/usr/local/gnupg26 + ldconfig -n /usr/local/gnupg26/lib - and adding /usr/local/gnupg24/bin to PATH. + and adding /usr/local/gnupg26/bin to PATH. ** Specific build problems on some machines: diff --git a/doc/Makefile.am b/doc/Makefile.am index 5be6009fa..fad425db7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -74,7 +74,7 @@ DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css YAT2M_OPTIONS = -I $(srcdir) \ - --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.4" + --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.6" myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \ dirmngr.texi scdaemon.texi tools.texi wks.texi \ |