[springlobby] 24/28: Update debian/copyright. Add jsoncpp license.
Markus Koschany
apo at moszumanska.debian.org
Mon Apr 11 04:58:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository springlobby.
commit 2e8512e96f4f2092835922f1c6c91eaa455fb858
Author: Markus Koschany <apo at debian.org>
Date: Mon Apr 11 03:40:12 2016 +0200
Update debian/copyright. Add jsoncpp license.
---
debian/copyright | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 01822d8..8afbe91 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -127,6 +127,7 @@ Copyright: 1999,2000,2002 Aladdin Enterprises
License: zlib/libpng
Files: src/downloader/lib/src/lib/jsoncpp/*
+ src/lsl/lib/jsoncpp/*
Copyright: 2007-2010, Baptiste Lepilleur
License: jsoncpp-License
@@ -668,28 +669,28 @@ License: CeCILL-v2.0
jurisdiction, by the more diligent Party.
License: jsoncpp-License
- The JsonCpp library's source code, including accompanying documentation,
+ The JsonCpp library's source code, including accompanying documentation,
tests and demonstration applications, are licensed under the following
conditions...
.
- The author (Baptiste Lepilleur) explicitly disclaims copyright in all
- jurisdictions which recognize such a disclaimer. In such jurisdictions,
+ The author (Baptiste Lepilleur) explicitly disclaims copyright in all
+ jurisdictions which recognize such a disclaimer. In such jurisdictions,
this software is released into the Public Domain.
.
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
released under the terms of the MIT License (see below).
.
- In jurisdictions which recognize Public Domain property, the user of this
- software may choose to accept it either as 1) Public Domain, 2) under the
- conditions of the MIT License (see below), or 3) under the terms of dual
+ In jurisdictions which recognize Public Domain property, the user of this
+ software may choose to accept it either as 1) Public Domain, 2) under the
+ conditions of the MIT License (see below), or 3) under the terms of dual
Public Domain/MIT License conditions described here, as they choose.
.
The MIT License is about as close to Public Domain as a license can get, and is
described in clear, concise terms at:
.
http://en.wikipedia.org/wiki/MIT_License
- .
+ .
The full text of the MIT License follows:
.
========================================================================
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git
More information about the Pkg-games-commits
mailing list