* Patch from James Westby to allow a description to be set for rss feeds.

[git.ikiwiki.info.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index bbefb99672dc9fd9057c4e0cdc5611b2d9b031b6..9b3639b35880a020f87a76b4f203da43b3589239 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +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. On Debian systems, the
- complete text of the GPL can be found in /usr/share/common-licenses/GPL
+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.
 
 The git code and logo are copyright 2006 by Recai Oktaş <roktas@debian.org>
 under the terms of the GPL version 2 or later.


@@ -10,7 +11,7 @@ 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.
 
        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 using a varient of the BSD license:
+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
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions