diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/copyright | 30 | ||||
| -rw-r--r-- | doc/BSD | 20 | ||||
| -rw-r--r-- | doc/freesoftware.mdwn | 6 |
4 files changed, 12 insertions, 46 deletions
diff --git a/debian/changelog b/debian/changelog index d6c725300..ffbc21206 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ ikiwiki (1.42) UNRELEASED; urgency=low PageSpecs, by using "./". * pagespec_match() has grown a new third parameter to support this. * Add "reverse" option to inline to invert sort orders. + * Drop the BSD license for the templates and basewiki, and just allow them + to be used as close to public domain as possible. -- Joey Hess <joeyh@debian.org> Thu, 8 Feb 2007 14:46:17 -0500 diff --git a/debian/copyright b/debian/copyright index 9b3639b35..9a5746751 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ -ikiwiki is copyright 2006 by Joey Hess <joey@kitenet.net> and contributors. -It is licensed under the terms of the GPL version 2 or later. On Debian -systems, the complete text of the GPL can be found in +ikiwiki is copyright 2006-2007 by Joey Hess <joey@kitenet.net> and +contributors. It is licensed under the terms of the GPL version 2 or later. +On Debian systems, the complete text of the GPL can be found in /usr/share/common-licenses/GPL The git code and logo are copyright 2006 by Recai Oktaş <roktas@debian.org> @@ -11,25 +11,7 @@ The smiley icons were copied from Moin Moin, which has these copyrights: Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au> Moin Moin is licensed under the terms of GPL version 2 or later. -The basewiki and templates are licensed using a variant of the BSD license: +The basewiki and templates are licensed as follows: -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY AUTHORS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. +Redistribution and use in source and compiled forms, with or without +modification, are permitted under any circumstances. No warranty. diff --git a/doc/BSD b/doc/BSD deleted file mode 100644 index 1ba5f1188..000000000 --- a/doc/BSD +++ /dev/null @@ -1,20 +0,0 @@ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn index 0e18b4daa..399bdebda 100644 --- a/doc/freesoftware.mdwn +++ b/doc/freesoftware.mdwn @@ -1,4 +1,6 @@ -ikiwiki is licensed under the terms of the GNU [[GPL]]. +ikiwiki is licensed under the terms of the GNU [[GPL]], version 2 or later. The parts of ikiwiki that become part of your own wiki (the basewiki pages -and the [[templates]]) are licensed using a form of the [[BSD]] license. +and the [[templates]]) are licensed as follows: Redistribution and use in +source and compiled forms, with or without modification, are permitted under +any circumstances. No warranty. |