Change a couple of files to use abbreviated copyright notes.

--

Also fixed some of my own copyright notices due to the termination of
my assignment.  The one displayed by --version is kept at FSF because
we had contributors in 2014 with FSF assignments and it gives the FSF
some visibility.
This commit is contained in:
Werner Koch 2014-11-04 16:28:03 +01:00
parent 587a0956b9
commit cf41763cdf
16 changed files with 41 additions and 43 deletions

View File

@ -15,7 +15,7 @@ copyrightable year that would otherwise be listed individually.
List of Copyright holders List of Copyright holders
========================= =========================
Copyright (C) 1997-1998, 2013-2014 Werner Koch Copyright (C) 1997-2014 Werner Koch
Copyright (C) 1994-2013 Free Software Foundation, Inc. Copyright (C) 1994-2013 Free Software Foundation, Inc.
Copyright (C) 2003-2013 g10 Code GmbH Copyright (C) 2003-2013 g10 Code GmbH
Copyright (C) 2002 Klarälvdalens Datakonsult AB Copyright (C) 2002 Klarälvdalens Datakonsult AB
@ -224,10 +224,8 @@ at the bottom of this file.
========= =========
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, Copyright 1998-2013 Free Software Foundation, Inc.
2006, 2007, 2008, 2009, 2010, 2011, Copyright 1997-2014 Werner Koch
2012, 2013 Free Software Foundation, Inc.
Copyright 1997, 1998, 2013, 2014 Werner Koch
This file is free software; as a special exception the author gives This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without unlimited permission to copy and/or distribute it, with or without

14
NEWS
View File

@ -1,11 +1,13 @@
Noteworthy changes in version 2.1.0 (unreleased) Noteworthy changes in version 2.1.0 (2014-11-06)
------------------------------------------------ ------------------------------------------------
* This release introduces a lot of changes. Most of them are This release introduces a lot of changes. Most of them are internal
internal and thus not user visible. However, some long standing and thus not user visible. However, some long standing behavior has
behavior has slightly changed and it is strongly suggested that an slightly changed and it is strongly suggested that an existing
existing "~/.gnupg" directory is backed up before this version is "~/.gnupg" directory is backed up before this version is used.
used.
A verbose description of the major new features and changes can be
found in the file doc/whats-new-in-2.1.txt.
* gpg: All support for v3 (PGP 2) keys has been dropped. All * gpg: All support for v3 (PGP 2) keys has been dropped. All
signatures are now created as v4 signatures. v3 keys will be signatures are now created as v4 signatures. v3 keys will be

6
README
View File

@ -2,7 +2,7 @@
========================= =========================
Version 2.1 Version 2.1
Copyright 1997-1998, 2013-2014 Werner Koch Copyright 1997-2014 Werner Koch
Copyright 1998-2013 Free Software Foundation, Inc. Copyright 1998-2013 Free Software Foundation, Inc.
@ -164,6 +164,10 @@
* HOW TO GET MORE INFORMATION * HOW TO GET MORE INFORMATION
A description of new features and changes in version 2.1 can be
found in the file "doc/whats-new-in-2.1.txt" and online at
"https://gnupg.org/faq/whats-new-in-2.1.html" .
The primary WWW page is "https://www.gnupg.org" The primary WWW page is "https://www.gnupg.org"
or using TOR "http://ic6au7wa3f6naxjq.onion" or using TOR "http://ic6au7wa3f6naxjq.onion"
The primary FTP site is "ftp://ftp.gnupg.org/gcrypt/" The primary FTP site is "ftp://ftp.gnupg.org/gcrypt/"

View File

@ -1,6 +1,6 @@
/* command-ssh.c - gpg-agent's ssh-agent emulation layer /* command-ssh.c - gpg-agent's ssh-agent emulation layer
* Copyright (C) 2004, 2005, 2006, 2009, 2012 Free Software Foundation, Inc. * Copyright (C) 2004-2006, 2009, 2012 Free Software Foundation, Inc.
* Copyright (C) 2013, 2014 Werner Koch * Copyright (C) 2004-2006, 2009, 2012-2014 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *

View File

@ -1,7 +1,6 @@
/* command.c - gpg-agent command handler /* command.c - gpg-agent command handler
* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, * Copyright (C) 2001-2011 Free Software Foundation, Inc.
* 2011 Free Software Foundation, Inc. * Copyright (C) 2001-2013 Werner Koch
* Copyright (C) 2013 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *

View File

@ -1,6 +1,5 @@
/* cvt-openpgp.c - Convert an OpenPGP key to our internal format. /* cvt-openpgp.c - Convert an OpenPGP key to our internal format.
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2009, * Copyright (C) 1998-2002, 2006, 2009, 2010 Free Software Foundation, Inc.
* 2010 Free Software Foundation, Inc.
* Copyright (C) 2013, 2014 Werner Koch * Copyright (C) 2013, 2014 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.

View File

@ -1,7 +1,6 @@
/* gpg-agent.c - The GnuPG Agent /* gpg-agent.c - The GnuPG Agent
* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, * Copyright (C) 2000-2007, 2009-2010 Free Software Foundation, Inc.
* 2010 Free Software Foundation, Inc. * Copyright (C) 2000-2014 Werner Koch
* Copyright (C) 2013, 2014 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *

View File

@ -1,6 +1,6 @@
/* pksign.c - public key signing (well, actually using a secret key) /* pksign.c - public key signing (well, actually using a secret key)
* Copyright (C) 2001, 2002, 2003, 2004, 2010 Free Software Foundation, Inc. * Copyright (C) 2001-2004, 2010 Free Software Foundation, Inc.
* Copyright (C) 2013 Werner Koch * Copyright (C) 2001-2004, 2010, 2013 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *

View File

@ -1,7 +1,6 @@
/* protect.c - Un/Protect a secret key /* protect.c - Un/Protect a secret key
* Copyright (C) 1998, 1999, 2000, 2001, 2002, * Copyright (C) 1998-2003, 2007, 2009, 2011 Free Software Foundation, Inc.
* 2003, 2007, 2009, 2011 Free Software Foundation, Inc. * Copyright (C) 1998-2003, 2007, 2009, 2011, 2013 Werner Koch
* Copyright (C) 2013 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *

View File

@ -1,7 +1,6 @@
/* [argparse.c wk 17.06.97] Argument Parser for option handling /* [argparse.c wk 17.06.97] Argument Parser for option handling
* Copyright (C) 1998, 1999, 2000, 2001, 2006 * Copyright (C) 1998-2001, 2006-2008, 2012 Free Software Foundation, Inc.
* 2007, 2008, 2012 Free Software Foundation, Inc. * Copyright (C) 1997-2001, 2006-2008, 2013 Werner Koch
* Copyright (C) 1997, 2013 Werner Koch
* *
* This file is part of JNLIB, which is a subsystem of GnuPG. * This file is part of JNLIB, which is a subsystem of GnuPG.
* *

View File

@ -1,7 +1,6 @@
# configure.ac - for GnuPG 2.1 # configure.ac - for GnuPG 2.1
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, # Copyright (C) 1998-2012 Free Software Foundation, Inc.
# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Copyright (C) 1998-2014 Werner Koch
# Copyright (C) 2013, 2014 Werner Koch
# #
# This file is part of GnuPG. # This file is part of GnuPG.
# #

View File

@ -1,5 +1,6 @@
/* card-util.c - Utility functions for the OpenPGP card. /* card-util.c - Utility functions for the OpenPGP card.
* Copyright (C) 2003, 2004, 2005, 2009 Free Software Foundation, Inc. * Copyright (C) 2003-2005, 2009 Free Software Foundation, Inc.
* Copyright (C) 2003-2005, 2009 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *

View File

@ -1,7 +1,6 @@
/* gpg.c - The GnuPG utility (main for gpg) /* gpg.c - The GnuPG utility (main for gpg)
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * Copyright (C) 1998-2011 Free Software Foundation, Inc.
* 2008, 2009, 2010, 2011 Free Software Foundation, Inc. * Copyright (C) 1997-2014 Werner Koch
* Copyright (C) 2013, 2014 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *

View File

@ -2,8 +2,8 @@
# the users home directory. # the users home directory.
# $Id$ # $Id$
# Options for GnuPG # Options for GnuPG
# Copyright 1998, 1999, 2000, 2001, 2002, 2003, # Copyright 1998-2003, 2010 Free Software Foundation, Inc.
# 2010 Free Software Foundation, Inc. # Copyright 1998-2003, 2010 Werner Koch
# #
# This file is free software; as a special exception the author gives # This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without # unlimited permission to copy and/or distribute it, with or without

View File

@ -1,6 +1,6 @@
/* scdaemon.c - The GnuPG Smartcard Daemon /* scdaemon.c - The GnuPG Smartcard Daemon
* Copyright (C) 2001, 2002, 2004, 2005, * Copyright (C) 2001-2002, 2004-2005, 2007-2009 Free Software Foundation, Inc.
* 2007, 2008, 2009 Free Software Foundation, Inc. * Copyright (C) 2001-2002, 2004-2005, 2007-2014 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *

View File

@ -1,6 +1,6 @@
/* gpgsm.c - GnuPG for S/MIME /* gpgsm.c - GnuPG for S/MIME
* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, * Copyright (C) 2001-2008, 2010 Free Software Foundation, Inc.
* 2010 Free Software Foundation, Inc. * Copyright (C) 2001-2008, 2010 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *