underlays/javascript/* use ikiwiki's permissive license

I'm the sole author and copyright holder of these files.

diff --git a/debian/copyright b/debian/copyright
index d6c66b303d3cb7edd22fbc4501d159194738f6fa..28b5aa5911d96dbcf7fda2686df8f51926906f31 100644 (file)
--- 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 b01957de467a55eeade0210ccedcd09d8c14611d..79194df1e2a6bb9c47559481804ad8eb4f986f94 100644 (file)
--- 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]]