web commit by l: added test case of numbered list following bullet list, which does...

[ikiwiki.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index eb41ea2f4667e179af5cd8dc96516d854a067d57..1a2883a99c9c871344f0ac27036213018b633558 100644 (file)
--- 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 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) 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:
 
 
 The basewiki and templates are licensed as follows: