aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-06 17:56:53 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-06 17:56:53 +0000
commit6807cc5b28bd38ee8e57c7011409e575c3dbefd2 (patch)
tree4ba04b716f3df80db6aa34273847e7867d673981
parentff1044375c7310e7a6b5245ff2cf142ae0559bb3 (diff)
downloadikiwiki-6807cc5b28bd38ee8e57c7011409e575c3dbefd2.tar
ikiwiki-6807cc5b28bd38ee8e57c7011409e575c3dbefd2.tar.gz
update
-rw-r--r--debian/copyright9
1 files changed, 6 insertions, 3 deletions
diff --git a/debian/copyright b/debian/copyright
index eb41ea2f4..1a2883a99 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,13 @@ On Debian systems, the complete text of the GPL can be found in
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.
The basewiki and templates are licensed as follows: