Ticket #1222: AboutSystem.diff2

File AboutSystem.diff2, 3.8 kB (added by scottmc, 3 months ago)
Line 
1Index: src/apps/aboutsystem/AboutSystem.cpp
2===================================================================
3--- src/apps/aboutsystem/AboutSystem.cpp        (revision 25269)
4+++ src/apps/aboutsystem/AboutSystem.cpp        (working copy)
5@@ -516,7 +516,7 @@
6                "released under the GPL and LGPL licences:\n"
7                "GNU C Library, "
8                "GNU coretools, diffutils, findutils, "
9-               "gawk, bison, m4, make, "
10+               "shareutils, gawk, bison, m4, make, "
11                "gdb, wget, ncurses, termcap, "
12                "Bourne Again Shell.\n"
13                "Copyright " B_UTF8_COPYRIGHT " The Free Software Foundation.",
14@@ -527,7 +527,8 @@
15        AddCopyrightEntry("The FreeBSD Project",
16                "Contains software from the FreeBSD Project, "
17                "released under the BSD licence:\n"
18-               "ping, telnet, telnetd, traceroute\n"
19+               "cal, ftpd, ping, telnet, "
20+               "telnetd, traceroute\n"
21                "Copyright " B_UTF8_COPYRIGHT " 1994-2008 The FreeBSD Project.  "
22                "All rights reserved.",
23                "http://www.freebsd.org");
24@@ -536,7 +537,7 @@
25        AddCopyrightEntry("The NetBSD Project",
26                "Contains software developed by the NetBSD, "
27                "Foundation, Inc. and its contributors:\n"
28-               "ftp\n"
29+               "ftp, tput\n"
30                "Copyright " B_UTF8_COPYRIGHT " 1996-2008 The NetBSD Foundation, Inc.  "
31                "All rights reserved.",
32                "http://www.netbsd.org");
33@@ -646,12 +647,25 @@
34 
35        // acpica copyrights
36        AddCopyrightEntry("acpica",
37-               "Copyright " B_UTF8_COPYRIGHT " 1999 - 2006 Intel Corp.");
38+               "Copyright " B_UTF8_COPYRIGHT " 1999-2006 Intel Corp.");
39 
40        // unrar copyrights
41        AddCopyrightEntry("unrar",
42-               "Copyright " B_UTF8_COPYRIGHT " Alexander L. Roshal.");
43+               "Copyright " B_UTF8_COPYRIGHT " 2002-2008 Alexander L. Roshal. "
44+               "All rights reserved.",
45+               "http://www.rarlab.com");
46 
47+// p7zip copyrights
48+//     AddCopyrightEntry("p7zip",
49+//             "Copyright " B_UTF8_COPYRIGHT " 2008 Igor Pavlov. "
50+//             "All rights reserved.");
51+
52+// libMicros copyrights
53+//     AddCopyrightEntry("libMicro",
54+//             "Copyright " B_UTF8_COPYRIGHT " 2007 Sun Microsystems, Inc. "
55+//             "All rights reserved.");
56+               // Open Solaris License
57+
58        // libpng copyrights
59        AddCopyrightEntry("libpng",
60                "Copyright " B_UTF8_COPYRIGHT " 2004, 2006-2008 Glenn "
61@@ -659,8 +673,8 @@
62 
63        // libprint copyrights
64        AddCopyrightEntry("libprint",
65-               "Copyright " B_UTF8_COPYRIGHT " 1999-2000 Y.Takagi. All Rights "
66-               "Reserved.");
67+               "Copyright " B_UTF8_COPYRIGHT " 1999-2000 Y.Takagi. All rights "
68+               "reserved.");
69 
70        // cortex copyrights
71        AddCopyrightEntry("Cortex",
72@@ -676,24 +690,37 @@
73 
74        // libxml2, libxslt, libexslt copyrights
75        AddCopyrightEntry("libxml2, libxslt",
76-               "Copyright " B_UTF8_COPYRIGHT " 1998-2003 Daniel Veillard.  All Rights "
77-               "Reserved.");
78+               "Copyright " B_UTF8_COPYRIGHT " 1998-2003 Daniel Veillard. "
79+               "All rights reserved.");
80 
81        AddCopyrightEntry("libexslt",
82                "Copyright " B_UTF8_COPYRIGHT " 2001-2002 Thomas Broyer, Charlie "
83-               "Bozeman and Daniel Veillard.  All Rights Reserved.");
84+               "Bozeman and Daniel Veillard.  All rights reserved.");
85 
86        // Xiph.org Foundation copyrights
87        AddCopyrightEntry("Xiph.org Foundation",
88                "libvorbis, libogg, libtheora, libspeex"
89-               "Copyright " B_UTF8_COPYRIGHT " 1994-2008 Xiph.Org.  All rights "
90-               "reserved.", "http://www.xiph.org");
91+               "Copyright " B_UTF8_COPYRIGHT " 1994-2008 Xiph.Org. "
92+               "All rights reserved.",
93+               "http://www.xiph.org");
94 
95        // The Tcpdump Group
96        AddCopyrightEntry("The Tcpdump Group",
97                "tcpdump, libpcap",
98                "http://www.tcpdump.org");           
99 
100+       // Matroska
101+       AddCopyrightEntry("libmatroska",
102+               "Copyright " B_UTF8_COPYRIGHT " 2002-2003 Steve Lhomme. "
103+               "All rights reserved.",
104+               "http://www.matroska.org");
105+
106+// OpenSound
107+//     AddCopyrightEntry("OpenSound",
108+//             "Copyright " B_UTF8_COPYRIGHT " 1996-2008 4Front Technologies ",
109+//             "http://www.opensound.com");
110+// BSD license         
111+
112        _AddCopyrightsFromAttribute();
113 
114        // Build a list of installed applications and show their