Ticket #1222: AboutSystem.cpp.diff#2

File AboutSystem.cpp.diff#2, 3.7 kB (added by scottmc, 6 months ago)

diff for 2nd round of updates.

Line 
1Index: src/apps/aboutsystem/AboutSystem.cpp
2===================================================================
3--- src/apps/aboutsystem/AboutSystem.cpp        (revision 25129)
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+               "sharutils, 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@@ -652,6 +653,12 @@
34        AddCopyrightEntry("unrar",
35                "Copyright " B_UTF8_COPYRIGHT " Alexander L. Roshal.");
36 
37+       // libmicro copyrights
38+       AddCopyrightEntry("libMicro",
39+               "Copyright " B_UTF8_COPYRIGHT " 2007 Sun Microsystems, Inc. "
40+               "All rights reserved.");
41+               // Open Solaris License
42+
43        // libpng copyrights
44        AddCopyrightEntry("libpng",
45                "Copyright " B_UTF8_COPYRIGHT " 2004, 2006-2008 Glenn "
46@@ -659,8 +666,8 @@
47 
48        // libprint copyrights
49        AddCopyrightEntry("libprint",
50-               "Copyright " B_UTF8_COPYRIGHT " 1999-2000 Y.Takagi. All Rights "
51-               "Reserved.");
52+               "Copyright " B_UTF8_COPYRIGHT " 1999-2000 Y.Takagi. All rights "
53+               "reserved.");
54 
55        // cortex copyrights
56        AddCopyrightEntry("Cortex",
57@@ -676,24 +683,38 @@
58 
59        // libxml2, libxslt, libexslt copyrights
60        AddCopyrightEntry("libxml2, libxslt",
61-               "Copyright " B_UTF8_COPYRIGHT " 1998-2003 Daniel Veillard.  All Rights "
62-               "Reserved.");
63+               "Copyright " B_UTF8_COPYRIGHT " 1998-2003 Daniel Veillard. "
64+               "All rights reserved.");
65 
66        AddCopyrightEntry("libexslt",
67                "Copyright " B_UTF8_COPYRIGHT " 2001-2002 Thomas Broyer, Charlie "
68-               "Bozeman and Daniel Veillard.  All Rights Reserved.");
69+               "Bozeman and Daniel Veillard.  All rights reserved.");
70 
71        // Xiph.org Foundation copyrights
72        AddCopyrightEntry("Xiph.org Foundation",
73                "libvorbis, libogg, libtheora, libspeex"
74-               "Copyright " B_UTF8_COPYRIGHT " 1994-2008 Xiph.Org.  All rights "
75-               "reserved.", "http://www.xiph.org");
76+               "Copyright " B_UTF8_COPYRIGHT " 1994-2008 Xiph.Org. "
77+               "All rights reserved.",
78+               "http://www.xiph.org");
79 
80        // The Tcpdump Group
81        AddCopyrightEntry("The Tcpdump Group",
82                "tcpdump, libpcap",
83-               "http://www.tcpdump.org");           
84+               "http://www.tcpdump.org");
85 
86+       // Matroska
87+       AddCopyrightEntry("libmatroska",
88+               "Copyright " B_UTF8_COPYRIGHT " 2002-2003 Steve Lhomme. "
89+               "All rights reserved.",
90+               "http://www.matroska.org");
91+
92+       // OpenSound
93+//     AddCopyrightEntry("OpenSound",
94+//             "copyright " B_UTF8_COPYRIGHT " XXXX-XXXX 4Front Technologies ",
95+// TODO fix copyright year
96+//             "http://www.opensound.com");         
97+               //GPLv2 license
98+
99        _AddCopyrightsFromAttribute();
100 
101        // Build a list of installed applications and show their
102Index: src/add-ons/kernel/bus_managers/usb/usb_p.h
103===================================================================
104--- src/add-ons/kernel/bus_managers/usb/usb_p.h (revision 25129)
105+++ src/add-ons/kernel/bus_managers/usb/usb_p.h (working copy)
106@@ -7,6 +7,8 @@
107  *             Niels S. Reedijk
108  */
109 
110+#define TRACE_USB
111+
112 #ifndef _USB_P_
113 #define _USB_P_
114