From c0a6b6b2d7527a1975030aed8a5b9ce79cf725f0 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 20 Jan 2023 09:07:20 +0100 Subject: [PATCH] doc: Update copyright notices. -- Note that we now print Copyright g10 Code instead of FSF. --- AUTHORS | 2 +- README | 6 +++--- common/w32info-rc.h.in | 2 +- configure.ac | 19 +++---------------- doc/Makefile.am | 2 +- 5 files changed, 9 insertions(+), 22 deletions(-) diff --git a/AUTHORS b/AUTHORS index 55f4c85f2..bd1d528e3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,7 +16,7 @@ List of Copyright holders ========================= Copyright (C) 1997-2019 Werner Koch - Copyright (C) 2003-2022 g10 Code GmbH + Copyright (C) 2003-2023 g10 Code GmbH Copyright (C) 1994-2021 Free Software Foundation, Inc. Copyright (C) 2002 Klarälvdalens Datakonsult AB Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper diff --git a/README b/README index 3ee5cf454..42eed238f 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ - The GNU Privacy Guard 2 - ========================= + The GNU Privacy Guard + ======================= Version 2.4 Copyright 1997-2019 Werner Koch Copyright 1998-2021 Free Software Foundation, Inc. - Copyright 2003-2022 g10 Code GmbH + Copyright 2003-2023 g10 Code GmbH * INTRODUCTION diff --git a/common/w32info-rc.h.in b/common/w32info-rc.h.in index 94f13b054..1e76b58a9 100644 --- a/common/w32info-rc.h.in +++ b/common/w32info-rc.h.in @@ -29,4 +29,4 @@ built on @BUILD_HOSTNAME@ at @BUILD_TIMESTAMP@\0" #define W32INFO_PRODUCTVERSION "@VERSION@\0" #define W32INFO_LEGALCOPYRIGHT "Copyright \xa9 \ -2021 g10 Code GmbH\0" +2023 g10 Code GmbH\0" diff --git a/configure.ac b/configure.ac index 9cc15c442..c31ae026a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac - for GnuPG 2.1 # Copyright (C) 1998-2019 Werner Koch # Copyright (C) 1998-2021 Free Software Foundation, Inc. -# Copyright (C) 2003-2022 g10 Code GmbH +# Copyright (C) 2003-2023 g10 Code GmbH # # This file is part of GnuPG. # @@ -52,6 +52,7 @@ 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, build-aux/getswdb.sh, and Makefile.am +# As well as the source info for the man pages. AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg24", [swdb tag for this branch]) NEED_GPGRT_VERSION=1.46 @@ -524,21 +525,7 @@ AH_BOTTOM([ #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d" #define GNUPG_CACHE_DIR "cache.d" -/* GnuPG has always been a part of the GNU project and thus we have - * shown the FSF as holder of the copyright. We continue to do so for - * the reason that without the FSF the free software used all over the - * world would not have come into existence. However, under Windows - * we print a different copyright string with --version because the - * copyright assignments of g10 Code and Werner Koch were terminated - * many years ago, g10 Code is still the major contributor to the - * code, and Windows is not an FSF endorsed platform. Note that the - * actual list of copyright holders can be found in the AUTHORS file. */ -#ifdef HAVE_W32_SYSTEM -#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 g10 Code GmbH" -#else -#define GNUPG_DEF_COPYRIGHT_LINE \ - "Copyright (C) 2021 Free Software Foundation, Inc." -#endif +#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2023 g10 Code GmbH" /* For some systems (DOS currently), we hardcode the path here. For POSIX systems the values are constructed by the Makefiles, so that diff --git a/doc/Makefile.am b/doc/Makefile.am index 2d45f378e..0093c43a8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -85,7 +85,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.3" + --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.4" myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \ dirmngr.texi scdaemon.texi tools.texi wks.texi \