diff options
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright index d6c66b303..28b5aa591 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ Copyright: © 2006-2011 Joey Hess <joey@ikiwiki.info> License: GPL-2+ Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/* - ikiwiki.setup po/underlays/* + ikiwiki.setup po/underlays/* underlays/javascript/* Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info> License: permissive diff --git a/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn b/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn index b01957de4..79194df1e 100644 --- a/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn +++ b/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn @@ -12,3 +12,9 @@ Thanks > holder; nobody else can give an authoritative answer about the JS's license. Joey, > if you want `underlays/javascript` to be permissively-licensed, please amend > `debian/copyright` accordingly. --[[smcv]] +> +>> It was intended to be permissive. I've amended the copyright file. +>> [[done]] +>> +>> I wouldn't mind including information readable by librejs in those +>> files, if someone wants to send a patch. --[[Joey]] |