summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-04-04 01:46:49 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-04-04 01:46:49 (EDT)
commit12e75c9aeae92da41d300a5fdc88aced964454eb (patch)
treec3b88f4ef942ca1896851ee2c1449a69db92f3e2
parentbea164a95259ce41e2ddb6f055433187b7890ff2 (diff)
copyright: Add own name and include full license.
-rw-r--r--copyright33
1 files changed, 26 insertions, 7 deletions
diff --git a/copyright b/copyright
index 70ea66e..83a0cd0 100644
--- a/copyright
+++ b/copyright
@@ -3,21 +3,40 @@ Upstream Source
Location: <http://www.zlib.net>
-Copyright (c) 1995-2012 Jean-loup Gailly and Mark Adler
+Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
These files may be reproduced, distributed, modified, and otherwise dealt in
-under the terms of the zLib license.
+under the terms of the zlib license, found below.
-This license may be found at
-<http://www.zlib.net/zlib_license.html>.
Distribution Packaging
======================
Copyright (c) 2012 Kurt Meyer
+Copyright (C) 2013 Patrick "P. J." McDermott
These files may be reproduced, distributed, modified, and otherwise dealt in
-under the terms of the zLib license.
+under the terms of the zlib license, found below.
-This license may be found at
-<http://www.zlib.net/zlib_license.html>.
+
+zlib License
+============
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Jean-loup Gailly Mark Adler
+jloup@gzip.org madler@alumni.caltech.edu