the problem with coding while drunk -- idiotic mistakes

[ikiwiki.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index ed1dbd08ba46eb9776c02f8914d567b2a8632be0..9b3639b35880a020f87a76b4f203da43b3589239 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,7 @@
-ikiwiki is copyright 2006 by Joey Hess <joey@kitenet.net>. It is licensed
-under the terms of the GPL version 2 or later.
+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
+/usr/share/common-licenses/GPL
 
 The git code and logo are copyright 2006 by Recai Oktaş <roktas@debian.org>
 under the terms of the GPL version 2 or later.
@@ -9,5 +11,25 @@ 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.
 
-On Debian systems, the complete text of the GPL can be found in
-/usr/share/common-licenses/GPL.
+The basewiki and templates are licensed using a variant of the BSD license:
+
+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.