Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in licenses: ZLIB
Date: Tue, 07 Sep 2010 23:06:53
Message-Id: 20100907230643.CB1FB20051@flycatcher.gentoo.org
1 ulm 10/09/07 23:06:43
2
3 Modified: ZLIB
4 Log:
5 More general license template, bug 336249.
6
7 Revision Changes Path
8 1.2 licenses/ZLIB
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/ZLIB?rev=1.2&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/ZLIB?rev=1.2&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/ZLIB?r1=1.1&r2=1.2
13
14 Index: ZLIB
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/licenses/ZLIB,v
17 retrieving revision 1.1
18 retrieving revision 1.2
19 diff -u -r1.1 -r1.2
20 --- ZLIB 27 Jul 2002 16:26:11 -0000 1.1
21 +++ ZLIB 7 Sep 2010 23:06:43 -0000 1.2
22 @@ -1,27 +1,17 @@
23 -/* zlib.h -- interface of the 'zlib' general purpose compression library
24 - version 1.1.4, March 11th, 2002
25 -
26 - Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
27 -
28 - This software is provided 'as-is', without any express or implied
29 - warranty. In no event will the authors be held liable for any damages
30 - arising from the use of this software.
31 -
32 - Permission is granted to anyone to use this software for any purpose,
33 - including commercial applications, and to alter it and redistribute it
34 - freely, subject to the following restrictions:
35 -
36 - 1. The origin of this software must not be misrepresented; you must not
37 - claim that you wrote the original software. If you use this software
38 - in a product, an acknowledgment in the product documentation would be
39 - appreciated but is not required.
40 - 2. Altered source versions must be plainly marked as such, and must not be
41 - misrepresented as being the original software.
42 - 3. This notice may not be removed or altered from any source distribution.
43 -
44 - Jean-loup Gailly jloup@××××.org
45 - Mark Adler madler@××××××××××××××.edu
46 -
47 -*/
48 -
49 +Copyright (C) <year> <copyright holders>
50
51 +This software is provided 'as-is', without any express or implied
52 +warranty. In no event will the author(s) be held liable for any damages
53 +arising from the use of this software.
54 +
55 +Permission is granted to anyone to use this software for any purpose,
56 +including commercial applications, and to alter it and redistribute it
57 +freely, subject to the following restrictions:
58 +
59 +1. The origin of this software must not be misrepresented; you must not
60 + claim that you wrote the original software. If you use this software
61 + in a product, an acknowledgment in the product documentation would be
62 + appreciated but is not required.
63 +2. Altered source versions must be plainly marked as such, and must not be
64 + misrepresented as being the original software.
65 +3. This notice may not be removed or altered from any source distribution.