diff options
| author | Joey Hess <joey@kitenet.net> | 2011-05-19 14:37:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-05-19 14:37:16 -0400 |
| commit | 30c3ceeaa24c9e5e30407d44a78fe56754960f52 (patch) | |
| tree | 872897d3133e4b86ccb242130d6bdfcbe01acfef /debian | |
| parent | e818ad1c045f5e475de13716d847303ea9b59c4e (diff) | |
| download | ikiwiki-30c3ceeaa24c9e5e30407d44a78fe56754960f52.tar ikiwiki-30c3ceeaa24c9e5e30407d44a78fe56754960f52.tar.gz | |
Changed license of madduck's python plugins from GPL-2 to BSD-2-clause.
Apparently the rst library is changing to a GPL-2 incompatable license.
"madduck: joeyh: so yes, do as you think is right."
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/copyright | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 9d1278eb1..5ca986bee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low * Add additional directive quoting styles, to better support nested directives. Both triple-single-quote and heredoc quotes can be used. (Thanks, Timo Paulssen) + * Changed license of madduck's python plugins from GPL-2 to BSD-2-clause. -- Joey Hess <joeyh@debian.org> Thu, 05 May 2011 13:02:19 -0400 diff --git a/debian/copyright b/debian/copyright index 5dacdc4bd..82c72d734 100644 --- a/debian/copyright +++ b/debian/copyright @@ -98,7 +98,7 @@ License: GPL-2+ Files: plugins/rst plugins/proxy.py plugins/pythondemo Copyright: © martin f. krafft <madduck@madduck.net> -License: GPL-2 +License: BSD-2-clause Files: IkiWiki/Plugin/calendar.pm Copyright: (c) 2006, 2007 Manoj Srivastava <srivasta@debian.org> |