summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2023-01-20 09:07:20 +0100
committerWerner Koch <wk@gnupg.org>2023-01-20 09:07:20 +0100
commitc0a6b6b2d7527a1975030aed8a5b9ce79cf725f0 (patch)
treed1e3e76c4b7e5e102415f539962452163230ac9a /configure.ac
parentwkd: Support option --output for command --check. (diff)
downloadgnupg2-c0a6b6b2d7527a1975030aed8a5b9ce79cf725f0.tar.xz
gnupg2-c0a6b6b2d7527a1975030aed8a5b9ce79cf725f0.zip
doc: Update copyright notices.
-- Note that we now print Copyright g10 Code instead of FSF.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac19
1 files changed, 3 insertions, 16 deletions
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