From cf41763cdf029461f160925e1e3b3593ac292a39 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 4 Nov 2014 16:28:03 +0100 Subject: [PATCH] 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. --- AUTHORS | 8 +++----- NEWS | 14 ++++++++------ README | 6 +++++- agent/command-ssh.c | 4 ++-- agent/command.c | 5 ++--- agent/cvt-openpgp.c | 3 +-- agent/gpg-agent.c | 5 ++--- agent/pksign.c | 4 ++-- agent/protect.c | 5 ++--- common/argparse.c | 5 ++--- configure.ac | 5 ++--- g10/card-util.c | 3 ++- g10/gpg.c | 5 ++--- g10/options.skel | 4 ++-- scd/scdaemon.c | 4 ++-- sm/gpgsm.c | 4 ++-- 16 files changed, 41 insertions(+), 43 deletions(-) diff --git a/AUTHORS b/AUTHORS index feede0621..faf0c7f1b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,7 +15,7 @@ copyrightable year that would otherwise be listed individually. 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) 2003-2013 g10 Code GmbH 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, - 2006, 2007, 2008, 2009, 2010, 2011, - 2012, 2013 Free Software Foundation, Inc. - Copyright 1997, 1998, 2013, 2014 Werner Koch + Copyright 1998-2013 Free Software Foundation, Inc. + Copyright 1997-2014 Werner Koch This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/NEWS b/NEWS index 908a12bdd..802e26edb 100644 --- a/NEWS +++ b/NEWS @@ -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 - internal and thus not user visible. However, some long standing - behavior has slightly changed and it is strongly suggested that an - existing "~/.gnupg" directory is backed up before this version is - used. + This release introduces a lot of changes. Most of them are internal + and thus not user visible. However, some long standing behavior has + slightly changed and it is strongly suggested that an existing + "~/.gnupg" directory is backed up before this version is 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 signatures are now created as v4 signatures. v3 keys will be diff --git a/README b/README index ad52077aa..fef57aab4 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ ========================= Version 2.1 - Copyright 1997-1998, 2013-2014 Werner Koch + Copyright 1997-2014 Werner Koch Copyright 1998-2013 Free Software Foundation, Inc. @@ -164,6 +164,10 @@ * 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" or using TOR "http://ic6au7wa3f6naxjq.onion" The primary FTP site is "ftp://ftp.gnupg.org/gcrypt/" diff --git a/agent/command-ssh.c b/agent/command-ssh.c index f3ef30c15..493011c2a 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -1,6 +1,6 @@ /* command-ssh.c - gpg-agent's ssh-agent emulation layer - * Copyright (C) 2004, 2005, 2006, 2009, 2012 Free Software Foundation, Inc. - * Copyright (C) 2013, 2014 Werner Koch + * Copyright (C) 2004-2006, 2009, 2012 Free Software Foundation, Inc. + * Copyright (C) 2004-2006, 2009, 2012-2014 Werner Koch * * This file is part of GnuPG. * diff --git a/agent/command.c b/agent/command.c index 7f8759d22..11bfbeb67 100644 --- a/agent/command.c +++ b/agent/command.c @@ -1,7 +1,6 @@ /* command.c - gpg-agent command handler - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, - * 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 Werner Koch + * Copyright (C) 2001-2011 Free Software Foundation, Inc. + * Copyright (C) 2001-2013 Werner Koch * * This file is part of GnuPG. * diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c index 6ea266628..671dd4cbc 100644 --- a/agent/cvt-openpgp.c +++ b/agent/cvt-openpgp.c @@ -1,6 +1,5 @@ /* cvt-openpgp.c - Convert an OpenPGP key to our internal format. - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2009, - * 2010 Free Software Foundation, Inc. + * Copyright (C) 1998-2002, 2006, 2009, 2010 Free Software Foundation, Inc. * Copyright (C) 2013, 2014 Werner Koch * * This file is part of GnuPG. diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 3f03ff4dc..720f5f4cc 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -1,7 +1,6 @@ /* gpg-agent.c - The GnuPG Agent - * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, - * 2010 Free Software Foundation, Inc. - * Copyright (C) 2013, 2014 Werner Koch + * Copyright (C) 2000-2007, 2009-2010 Free Software Foundation, Inc. + * Copyright (C) 2000-2014 Werner Koch * * This file is part of GnuPG. * diff --git a/agent/pksign.c b/agent/pksign.c index 0160a11f1..d737bad33 100644 --- a/agent/pksign.c +++ b/agent/pksign.c @@ -1,6 +1,6 @@ /* pksign.c - public key signing (well, actually using a secret key) - * Copyright (C) 2001, 2002, 2003, 2004, 2010 Free Software Foundation, Inc. - * Copyright (C) 2013 Werner Koch + * Copyright (C) 2001-2004, 2010 Free Software Foundation, Inc. + * Copyright (C) 2001-2004, 2010, 2013 Werner Koch * * This file is part of GnuPG. * diff --git a/agent/protect.c b/agent/protect.c index f633d562e..01e72c2ee 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -1,7 +1,6 @@ /* protect.c - Un/Protect a secret key - * Copyright (C) 1998, 1999, 2000, 2001, 2002, - * 2003, 2007, 2009, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013 Werner Koch + * Copyright (C) 1998-2003, 2007, 2009, 2011 Free Software Foundation, Inc. + * Copyright (C) 1998-2003, 2007, 2009, 2011, 2013 Werner Koch * * This file is part of GnuPG. * diff --git a/common/argparse.c b/common/argparse.c index 844c1707e..0a36a9e53 100644 --- a/common/argparse.c +++ b/common/argparse.c @@ -1,7 +1,6 @@ /* [argparse.c wk 17.06.97] Argument Parser for option handling - * Copyright (C) 1998, 1999, 2000, 2001, 2006 - * 2007, 2008, 2012 Free Software Foundation, Inc. - * Copyright (C) 1997, 2013 Werner Koch + * Copyright (C) 1998-2001, 2006-2008, 2012 Free Software Foundation, Inc. + * Copyright (C) 1997-2001, 2006-2008, 2013 Werner Koch * * This file is part of JNLIB, which is a subsystem of GnuPG. * diff --git a/configure.ac b/configure.ac index ce328e654..8cc06e133 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ # configure.ac - for GnuPG 2.1 -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Copyright (C) 2013, 2014 Werner Koch +# Copyright (C) 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1998-2014 Werner Koch # # This file is part of GnuPG. # diff --git a/g10/card-util.c b/g10/card-util.c index d7a67544d..08a969a9a 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -1,5 +1,6 @@ /* 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. * diff --git a/g10/gpg.c b/g10/gpg.c index 470d15257..c188d4a52 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -1,7 +1,6 @@ /* gpg.c - The GnuPG utility (main for gpg) - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - * 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - * Copyright (C) 2013, 2014 Werner Koch + * Copyright (C) 1998-2011 Free Software Foundation, Inc. + * Copyright (C) 1997-2014 Werner Koch * * This file is part of GnuPG. * diff --git a/g10/options.skel b/g10/options.skel index 9303f79ad..20b571118 100644 --- a/g10/options.skel +++ b/g10/options.skel @@ -2,8 +2,8 @@ # the users home directory. # $Id$ # Options for GnuPG -# Copyright 1998, 1999, 2000, 2001, 2002, 2003, -# 2010 Free Software Foundation, Inc. +# Copyright 1998-2003, 2010 Free Software Foundation, Inc. +# Copyright 1998-2003, 2010 Werner Koch # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 9c55297c4..a1f45e2d7 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -1,6 +1,6 @@ /* scdaemon.c - The GnuPG Smartcard Daemon - * Copyright (C) 2001, 2002, 2004, 2005, - * 2007, 2008, 2009 Free Software Foundation, Inc. + * Copyright (C) 2001-2002, 2004-2005, 2007-2009 Free Software Foundation, Inc. + * Copyright (C) 2001-2002, 2004-2005, 2007-2014 Werner Koch * * This file is part of GnuPG. * diff --git a/sm/gpgsm.c b/sm/gpgsm.c index cc8039c30..03b9bb9c9 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1,6 +1,6 @@ /* gpgsm.c - GnuPG for S/MIME - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - * 2010 Free Software Foundation, Inc. + * Copyright (C) 2001-2008, 2010 Free Software Foundation, Inc. + * Copyright (C) 2001-2008, 2010 Werner Koch * * This file is part of GnuPG. *