diff options
author | Werner Koch <[email protected]> | 2022-02-07 17:22:30 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2022-02-07 17:22:30 +0000 |
commit | ce6e0b172ebeeaf6d2e38a979ada70de0de72b37 (patch) | |
tree | edac09cd5f758c7338a72a56a53d3fd6b1a1c82d | |
parent | gpgconf: Make gpgconf --launch dirmngr work again (diff) | |
download | gnupg-ce6e0b172ebeeaf6d2e38a979ada70de0de72b37.tar.gz gnupg-ce6e0b172ebeeaf6d2e38a979ada70de0de72b37.zip |
Update copyright notices.
--
Note that for this LTS version we now print g10 Code as the first
copyright holder with --version. This is to avoid confusion at our
customers, now that we also provide a Linux^WGNU/Linux version of
GnuPG VS-Desktop and the Windows version has always shown g10 Code.
-rw-r--r-- | AUTHORS | 2 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | common/w32info-rc.h.in | 2 | ||||
-rw-r--r-- | configure.ac | 17 |
4 files changed, 5 insertions, 18 deletions
@@ -17,7 +17,7 @@ List of Copyright holders Copyright (C) 1997-2019 Werner Koch Copyright (C) 1994-2021 Free Software Foundation, Inc. - Copyright (C) 2003-2021 g10 Code GmbH + Copyright (C) 2003-2022 g10 Code GmbH Copyright (C) 2002 Klarälvdalens Datakonsult AB Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <[email protected]> Copyright (C) 1994 X Consortium @@ -4,7 +4,7 @@ Copyright 1997-2019 Werner Koch Copyright 1998-2021 Free Software Foundation, Inc. - Copyright 2003-2021 g10 Code GmbH + Copyright 2003-2022 g10 Code GmbH * INTRODUCTION diff --git a/common/w32info-rc.h.in b/common/w32info-rc.h.in index 94f13b054..4c0e034ae 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" +2022 g10 Code GmbH\0" diff --git a/configure.ac b/configure.ac index 8ca187c5a..35822fea8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac - for GnuPG 2.2 # Copyright (C) 1998-2019 Free Software Foundation, Inc. # Copyright (C) 1998-2019 Werner Koch -# Copyright (C) 2003-2021 g10 Code GmbH +# Copyright (C) 2003-2022 g10 Code GmbH # # This file is part of GnuPG. # @@ -509,20 +509,7 @@ AH_BOTTOM([ #define GNUPG_PRIVATE_KEYS_DIR "private-keys-v1.d" #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.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) 2022 g10 Code GmbH" /* For some systems (DOS currently), we hardcode the path here. For |