diff --git a/COPYING b/COPYING index 56e91a3c0..3b69bba67 100644 --- a/COPYING +++ b/COPYING @@ -1,17 +1,20 @@ -Most of Transmission is covered by the MIT license. - -Some files are copyrighted by Charles Kerr and are covered by -the GPL version 2. Works owned by the Transmission project -are granted a special exemption to clause 2(b) so that the bulk -of its code can remain under the MIT license. This exemption does -not extend to original or derived works not owned by the -Transmission project. - -The remainder of this text pertains only to the MIT-licensed -portions of Transmission. - Copyright 2005-2009. All code is copyrighted by the respective authors. +The OS X client, CLI client, and parts of libtransmission are licensed +under the terms of the MIT license. + +The Transmission daemon, GTK+ client, Qt client, Web client, and most of +libtransmission are licensed under the terms of the GNU GPL version 2, +with two special exceptions: + + 1. The MIT-licensed portions of Transmission listed above are exempt + from GPLv2 clause 2(b) and may retain their MIT license. + + 2. Permission is granted to link the code in this release with the + OpenSSL project's 'OpenSSL' library and to distribute the linked + executables. Works derived from Transmission may, at their authors' + discretion, keep or delete this exception. + MIT LICENSE: Permission is hereby granted, free of charge, to any person obtaining diff --git a/gtk/main.c b/gtk/main.c index 5a1dfa776..98f90f6ee 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -66,33 +66,10 @@ #if GTK_CHECK_VERSION( 2, 8, 0 ) #define SHOW_LICENSE static const char * LICENSE = - "Most of Transmission is covered by the MIT license." - "\n\n" - "Some files are copyrighted by Charles Kerr and are covered by " - "the GPL version 2. Works owned by the Transmission project " - "are granted a special exemption to clause 2(b) so that the bulk " - "of its code can remain under the MIT license. This exemption does " - "not extend to original or derived works not owned by the " - "Transmission project. " - "\n\n" - "Permission is hereby granted, free of charge, to any person obtaining " - "a copy of this software and associated documentation files (the " - "'Software'), to deal in the Software without restriction, including " - "without limitation the rights to use, copy, modify, merge, publish, " - "distribute, sublicense, and/or sell copies of the Software, and to " - "permit persons to whom the Software is furnished to do so, subject to " - "the following conditions: " - "\n\n" - "The above copyright notice and this permission notice shall be included " - "in all copies or substantial portions of the Software. " - "\n\n" - "THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, " - "EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF " - "MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. " - "IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY " - "CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, " - "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE " - "SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."; +"The OS X client, CLI client, and parts of libtransmission are licensed under the terms of the MIT license.\n\n" +"The Transmission daemon, GTK+ client, Qt client, Web client, and most of libtransmission are licensed under the terms of the GNU GPL version 2, with two special exceptions:\n\n" +"1. The MIT-licensed portions of Transmission listed above are exempt from GPLv2 clause 2(b) and may retain their MIT license.\n\n" +"2. Permission is granted to link the code in this release with the OpenSSL project's 'OpenSSL' library and to distribute the linked executables. Works derived from Transmission may, at their authors' discretion, keep or delete this exception."; #endif struct cbdata diff --git a/qt/license.cc b/qt/license.cc index 29fbabdf5..5443fb7ac 100644 --- a/qt/license.cc +++ b/qt/license.cc @@ -26,33 +26,10 @@ LicenseDialog :: LicenseDialog( QWidget * parent ): QPlainTextEdit * t = new QPlainTextEdit( this ); t->setReadOnly( true ); t->setPlainText( - "Most of Transmission is covered by the MIT license." - "\n\n" - "Some files are copyrighted by Charles Kerr and are covered by " - "the GPL version 2. Works owned by the Transmission project " - "are granted a special exemption to clause 2(b) so that the bulk " - "of its code can remain under the MIT license. This exemption does " - "not extend to original or derived works not owned by the " - "Transmission project. " - "\n\n" - "Permission is hereby granted, free of charge, to any person obtaining " - "a copy of this software and associated documentation files (the " - "'Software'), to deal in the Software without restriction, including " - "without limitation the rights to use, copy, modify, merge, publish, " - "distribute, sublicense, and/or sell copies of the Software, and to " - "permit persons to whom the Software is furnished to do so, subject to " - "the following conditions: " - "\n\n" - "The above copyright notice and this permission notice shall be included " - "in all copies or substantial portions of the Software. " - "\n\n" - "THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, " - "EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF " - "MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. " - "IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY " - "CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, " - "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE " - "SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." ); +"The OS X client, CLI client, and parts of libtransmission are licensed under the terms of the MIT license.\n\n" +"The Transmission daemon, GTK+ client, Qt client, Web client, and most of libtransmission are licensed under the terms of the GNU GPL version 2, with two special exceptions:\n\n" +"1. The MIT-licensed portions of Transmission listed above are exempt from GPLv2 clause 2(b) and may retain their MIT license.\n\n" +"2. Permission is granted to link the code in this release with the OpenSSL project's 'OpenSSL' library and to distribute the linked executables. Works derived from Transmission may, at their authors' discretion, keep or delete this exception." ); v->addWidget( t ); QDialogButtonBox * box = new QDialogButtonBox;