From bca6ea5547dc1b8436b22e6c3add2351df85ca0b Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 31 Jul 2003 17:53:57 +0000 Subject: 2003-07-31 Marcus Brinkmann * README: Clarify copyright conditions. * src/mkstrtable.awk: Don't claim in the copyright information that this program is part of libgpg-error. * src/mkerrnos.awk: Likewise. * src/mkerrcodes1.awk: Likewise. * src/mkerrcodes2.awk: Likewise. --- ChangeLog | 9 +++++++++ README | 15 ++++++++++++++- src/mkerrcodes1.awk | 8 +++----- src/mkerrcodes2.awk | 8 +++----- src/mkerrnos.awk | 8 +++----- src/mkstrtable.awk | 8 +++----- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index eccbe71..4f4fe0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-07-31 Marcus Brinkmann + + * README: Clarify copyright conditions. + * src/mkstrtable.awk: Don't claim in the copyright information + that this program is part of libgpg-error. + * src/mkerrnos.awk: Likewise. + * src/mkerrcodes1.awk: Likewise. + * src/mkerrcodes2.awk: Likewise. + 2003-07-31 Marcus Brinkmann * src/strerror.c (gpg_strerror): Use CODE, not ERR to map error diff --git a/README b/README index 734c2d8..79c5b1e 100644 --- a/README +++ b/README @@ -5,7 +5,20 @@ This is a library that defines common error values for all GnuPG components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, pinentry, SmartCard Daemon and possibly more in the future. -See the file COPYING for copyright and warranty information. +libgpg-error is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of the +License, or (at your option) any later version. See the file +COPYING.LIB for copyright and warranty information. + +However, some files (for example src/mkerrnos.awk) used in the build +process of the library are covered by a different license. Please see +the header of these files and the file COPYING for copyright and +warranty information on these files. A special exception in the +copyright license of these files makes sure that the output in the +build process, which is used in libgpg-error, is not affected by the +GPL. + Installation ------------ diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk index d666f51..6248d24 100644 --- a/src/mkerrcodes1.awk +++ b/src/mkerrcodes1.awk @@ -1,20 +1,18 @@ # mkerrcodes.awk # Copyright (C) 2003 g10 Code GmbH # -# This file is part of libgpg-error. -# -# libgpg-error is free software; you can redistribute it and/or +# This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of # the License, or (at your option) any later version. # -# libgpg-error is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with libgnupg-error; if not, write to the Free Software +# along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk index 54a0d18..ea58503 100644 --- a/src/mkerrcodes2.awk +++ b/src/mkerrcodes2.awk @@ -1,20 +1,18 @@ # mkstrtable.awk # Copyright (C) 2003 g10 Code GmbH # -# This file is part of libgpg-error. -# -# libgpg-error is free software; you can redistribute it and/or +# This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of # the License, or (at your option) any later version. # -# libgpg-error is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with libgnupg-error; if not, write to the Free Software +# along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk index 2f5fec2..16c23b1 100644 --- a/src/mkerrnos.awk +++ b/src/mkerrnos.awk @@ -1,20 +1,18 @@ # mkerrnos.awk # Copyright (C) 2003 g10 Code GmbH # -# This file is part of libgpg-error. -# -# libgpg-error is free software; you can redistribute it and/or +# This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of # the License, or (at your option) any later version. # -# libgpg-error is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with libgnupg-error; if not, write to the Free Software +# along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk index 8af96d2..33098a0 100644 --- a/src/mkstrtable.awk +++ b/src/mkstrtable.awk @@ -1,20 +1,18 @@ # mkstrtable.awk # Copyright (C) 2003 g10 Code GmbH # -# This file is part of libgpg-error. -# -# libgpg-error is free software; you can redistribute it and/or +# This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of # the License, or (at your option) any later version. # -# libgpg-error is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with libgnupg-error; if not, write to the Free Software +# along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to -- cgit v1.2.3