diff options
Diffstat (limited to '')
| -rw-r--r-- | AUTHORS | 6 | ||||
| -rw-r--r-- | COPYING.CC0 (renamed from tests/fake-pinentries/COPYING) | 2 | ||||
| -rw-r--r-- | COPYING.LIB | 6 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | tests/fake-pinentries/README.txt | 5 |
5 files changed, 15 insertions, 8 deletions
@@ -227,8 +227,10 @@ or later. Note that some files are under a combination of the GNU Lesser General Public License, version 3 and the GNU General Public License, version -2. A few other files carry the all permissive license note as found -at the bottom of this file. +2. A few files carry an all permissive license note as found at the +bottom of this file. Some small files are distributed under the +Creative Commons Zero (CC0-1.0-Universal) license which basically puts +them into the public domain. ========= diff --git a/tests/fake-pinentries/COPYING b/COPYING.CC0 index 0e259d42c..02ba3668d 100644 --- a/tests/fake-pinentries/COPYING +++ b/COPYING.CC0 @@ -1,3 +1,5 @@ +[Note that only a few files are distributed under this license.] + Creative Commons Legal Code CC0 1.0 Universal diff --git a/COPYING.LIB b/COPYING.LIB index fc8a5de7e..75885f4a0 100644 --- a/COPYING.LIB +++ b/COPYING.LIB @@ -1,3 +1,5 @@ +[Note that only a few files are distributed under this license.] + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 @@ -10,7 +12,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +113,7 @@ the following: a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the diff --git a/Makefile.am b/Makefile.am index bf1230226..b589e72e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,8 +25,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-g13 \ GITLOG_TO_CHANGELOG=gitlog-to-changelog EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \ - ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011 \ - VERSION README.GIT build-aux/gitlog-to-changelog \ + ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011 \ + VERSION README.GIT build-aux/gitlog-to-changelog COPYING.CC0 \ build-aux/git-log-fix build-aux/git-log-footer \ build-aux/getswdb.sh \ build-aux/speedo.mk \ diff --git a/tests/fake-pinentries/README.txt b/tests/fake-pinentries/README.txt index 1b447c441..9272ae515 100644 --- a/tests/fake-pinentries/README.txt +++ b/tests/fake-pinentries/README.txt @@ -11,8 +11,9 @@ different languages, with the intent of making them available to developers who have different languages available. They are all licensed Creative Commons Zero (CC0-1.0-Universal, see -the COPYING file in this directory), so they should be reusable by any -project. Feel free to copy them into your own project's test suite. +the COPYING.CC0 file in GnuPG's top directory), so they should be +reusable by any project. Feel free to copy them into your own +project's test suite. Rationale --------- |