From: Stef Walter <stefw@gnome.org>
Date: Mon, 6 Aug 2012 13:33:35 +0000 (+0200)
Subject: More licensing tweaks
X-Git-Tag: upstream/0.13~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18e125d4622119a478fcf527d3313f6866ab8bf0;p=platform%2Fupstream%2Flibsecret.git

More licensing tweaks

 * Actually include in the tarball the other licenses for test code
 * Refer to COPYING.TESTS not COPYING.GPL

https://bugzilla.gnome.org/show_bug.cgi?id=681302
---

diff --git a/Makefile.am b/Makefile.am
index 3a64aaf..2bdd1e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,9 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-silent-rules \
 	--enable-gtk-doc
 
+EXTRA_DIST = \
+	COPYING.TESTS
+
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \
 	then \
diff --git a/libsecret/tests/mock/hkdf.py b/libsecret/tests/mock/hkdf.py
index 42bc285..c4424ae 100644
--- a/libsecret/tests/mock/hkdf.py
+++ b/libsecret/tests/mock/hkdf.py
@@ -8,9 +8,7 @@
 #	under the Transitive Grace Period Public Licence, version 1.0 or, at
 #	your option, any later version.  (You may choose to use this package
 #	under the terms of either licence, at your option.)  See the file
-#	COPYING.GPL for the terms of the GNU General Public License, version 2.
-#	See the file COPYING.TGPPL.html for the terms of the Transitive Grace
-#	Period Public Licence, version 1.0.
+#	COPYING.TESTS for the terms of the GNU General Public License, version 2.
 #
 #	The following licensing text applies to a subset of the Crypto++ source code
 #	which is included in the pycryptopp source tree under the "embeddedcryptopp"