* Allow simple alphanumeric style attribute values in the htmlscrubber. This

[ikiwiki.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index ed1dbd08ba46eb9776c02f8914d567b2a8632be0..1a2883a99c9c871344f0ac27036213018b633558 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,20 @@
-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-2007 by Joey Hess <joey@ikiwiki.info> 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.
 
-The smiley icons were copied from Moin Moin, which has these copyrights:
+The smiley icons were copied from Moin Moin and phpBB, which have these
+copyrights:
        Copyright (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>
-       Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au>
-Moin Moin is licensed under the terms of GPL version 2 or later.
+       Copyright (c) 1999, 2000 Martin Pool <mbp@humbug.org.au>
+       Copyright (c) 2002 phpBB Group
+Moin Moin is licensed under the terms of GPL version 2 or later,
+and phpBB is licensed under the GPL version 2.
 
-On Debian systems, the complete text of the GPL can be found in
-/usr/share/common-licenses/GPL.
+The basewiki and templates are licensed as follows:
+
+Redistribution and use in source and compiled forms, with or without
+modification, are permitted under any circumstances. No warranty.