urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Drop the BSD license for the templates and basewiki, and just allow them 

to be used as close to public domain as possible.
master
joey 2007-02-08 21:19:21 +00:00
parent 79751cdaf2
commit 56f8e6344c
4 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -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

30
debian/copyright vendored
View File

@ -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.

20
doc/BSD
View File

@ -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.

6
doc/freesoftware.mdwn
View File

@ -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.