diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-04 04:29:37 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-04 04:29:37 +0000 |
| commit | be56970d0565cc259bf28b1a3aa9582269c8d41f (patch) | |
| tree | 086f7b2927fc14680016486eb3a9a8a71b35f08f /debian | |
| parent | b3d24f6a63a8467c2df45ad74ee952aec5647e67 (diff) | |
| download | ikiwiki-be56970d0565cc259bf28b1a3aa9582269c8d41f.tar ikiwiki-be56970d0565cc259bf28b1a3aa9582269c8d41f.tar.gz | |
* Added smiley plugin, nicely controlled and documented by the smileys page.
* Copied in some smileys from Moin Moin.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/copyright | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 02e78816d..3e65b39ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ ikiwiki (1.1) UNRELEASED; urgency=low * Add some basic docs about writing RCS modules. * Broke search capability out into a plugin, removed the --hyperestraier switch. + * Added smiley plugin, nicely controlled and documented by the smileys page. + * Copied in some smileys from Moin Moin. -- Joey Hess <joeyh@debian.org> Tue, 2 May 2006 14:13:59 -0400 diff --git a/debian/copyright b/debian/copyright index 0992a2a2d..4260584e1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,10 @@ ikiwiki is copyright 2006 by Joey Hess <joey@kitenet.net>. It is licensed under the terms of the GPL. +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. + On Debian systems, the complete text of the GPL can be found in /usr/share/common-licenses/GPL. |