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: BZIP2
Date: Sun, 04 Nov 2012 16:41:08
Message-Id: 20121104164052.ED312215F3@flycatcher.gentoo.org
1 ulm 12/11/04 16:40:52
2
3 Modified: BZIP2
4 Log:
5 Convert into license template.
6
7 Revision Changes Path
8 1.2 licenses/BZIP2
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/BZIP2?rev=1.2&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/BZIP2?rev=1.2&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/licenses/BZIP2?r1=1.1&r2=1.2
13
14 Index: BZIP2
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/licenses/BZIP2,v
17 retrieving revision 1.1
18 retrieving revision 1.2
19 diff -u -r1.1 -r1.2
20 --- BZIP2 27 Jul 2002 16:26:11 -0000 1.1
21 +++ BZIP2 4 Nov 2012 16:40:52 -0000 1.2
22 @@ -1,6 +1,5 @@
23 -
24 -This program, "bzip2" and associated library "libbzip2", are
25 -copyright (C) 1996-2002 Julian R Seward. All rights reserved.
26 +<copyright notice>
27 +All rights reserved.
28
29 Redistribution and use in source and binary forms, with or without
30 modification, are permitted provided that the following conditions
31 @@ -9,16 +8,16 @@
32 1. Redistributions of source code must retain the above copyright
33 notice, this list of conditions and the following disclaimer.
34
35 -2. The origin of this software must not be misrepresented; you must
36 - not claim that you wrote the original software. If you use this
37 - software in a product, an acknowledgment in the product
38 +2. The origin of this software must not be misrepresented; you must
39 + not claim that you wrote the original software. If you use this
40 + software in a product, an acknowledgment in the product
41 documentation would be appreciated but is not required.
42
43 3. Altered source versions must be plainly marked as such, and must
44 not be misrepresented as being the original software.
45
46 -4. The name of the author may not be used to endorse or promote
47 - products derived from this software without specific prior written
48 +4. The name of the author may not be used to endorse or promote
49 + products derived from this software without specific prior written
50 permission.
51
52 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
53 @@ -32,8 +31,3 @@
54 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
55 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
56 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
57 -
58 -Julian Seward, Cambridge, UK.
59 -jseward@×××.org
60 -bzip2/libbzip2 version 1.0.2 of 30 December 2001
61 -