* Correct a deadlock that could occur in post-commit if the aggregate plugin

[ikiwiki.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 0992a2a2d6fd2ceedd34ce853e733cb52197251b..eb41ea2f4667e179af5cd8dc96516d854a067d57 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,17 @@
-ikiwiki is copyright 2006 by Joey Hess <joey@kitenet.net>. It is licensed
-under the terms of the GPL.
-
+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.
+/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:
+       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.
+
+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.