[git] GnuPG - branch, master, updated. gnupg-2.1.15-130-g293d265
by Werner Koch
cvs at cvs.gnupg.org
Mon Sep 19 10:06:19 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 293d265290e0556f57f4812d66b6be87a3b91b9a (commit)
via 3899041cd2877ce9584c7bd149f232f35a07c399 (commit)
from 47baeac50ccaaf06dc8b0cebece50f47754de6ca (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 293d265290e0556f57f4812d66b6be87a3b91b9a
Author: Werner Koch <wk at gnupg.org>
Date: Mon Sep 19 10:01:31 2016 +0200
build: Distribute fake pinentries.
--
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1b25b78..d72f51e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,6 +41,11 @@ EXTRA_DIST = runtest inittests $(testscripts) ChangeLog-2011 \
text-1.txt text-2.txt text-3.txt \
text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \
text-2.osig.pem text-2.osig-bad.pem \
+ fake-pinentries/README.txt \
+ fake-pinentries/fake-pinentry.php \
+ fake-pinentries/fake-pinentry.pl \
+ fake-pinentries/fake-pinentry.py \
+ fake-pinentries/fake-pinentry.sh \
samplekeys/steed-self-signing-nonthority.pem \
samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \
samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
commit 3899041cd2877ce9584c7bd149f232f35a07c399
Author: Werner Koch <wk at gnupg.org>
Date: Mon Sep 19 10:03:07 2016 +0200
doc: Update license information.
* tests/fake-pinentries/COPYING: Rename to ...
* COPYING.CC0: this. Add a note on the scope of this license.
* COPYING.LIB: Add a note on the scope of this license.
* AUTHORS (License): Mention CC) license.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/AUTHORS b/AUTHORS
index 861258f..92b11b3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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
similarity index 99%
rename from tests/fake-pinentries/COPYING
rename to COPYING.CC0
index 0e259d4..02ba366 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 fc8a5de..75885f4 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 bf12302..b589e72 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 1b447c4..9272ae5 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
---------
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 6 ++++--
tests/fake-pinentries/COPYING => COPYING.CC0 | 2 ++
COPYING.LIB | 6 ++++--
Makefile.am | 4 ++--
tests/Makefile.am | 5 +++++
tests/fake-pinentries/README.txt | 5 +++--
6 files changed, 20 insertions(+), 8 deletions(-)
rename tests/fake-pinentries/COPYING => COPYING.CC0 (99%)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list