aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--underlays/javascript/ikiwiki/ikiwiki.js4
-rw-r--r--underlays/javascript/ikiwiki/relativedate.js4
-rw-r--r--underlays/javascript/ikiwiki/toggle.js4
4 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4be8489dc..a2d94dca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
* emailauth: Added emailauth_sender config.
* Modified page.tmpl to to set html lang= and dir= when
values have been specified for them, which the po plugin does.
+ * Specifically license the javascript underlay under the permissive
+ basewiki license.
[ Simon McVittie ]
* Run autopkgtest tests using autodep8 and the pkg-perl team's
diff --git a/underlays/javascript/ikiwiki/ikiwiki.js b/underlays/javascript/ikiwiki/ikiwiki.js
index aebc5cf7e..e67d5df83 100644
--- a/underlays/javascript/ikiwiki/ikiwiki.js
+++ b/underlays/javascript/ikiwiki/ikiwiki.js
@@ -1,3 +1,7 @@
+// © 2006-2010 Joey Hess
+// Redistribution and use in source and compiled forms, with or without
+// modification, are permitted under any circumstances. No warranty.
+//
// ikiwiki's javascript utility function library
var hooks;
diff --git a/underlays/javascript/ikiwiki/relativedate.js b/underlays/javascript/ikiwiki/relativedate.js
index 2a270d627..e8643f4c1 100644
--- a/underlays/javascript/ikiwiki/relativedate.js
+++ b/underlays/javascript/ikiwiki/relativedate.js
@@ -1,3 +1,7 @@
+// © 2006-2010 Joey Hess
+// Redistribution and use in source and compiled forms, with or without
+// modification, are permitted under any circumstances. No warranty.
+//
// Causes html elements in the 'relativedate' class to be displayed
// as relative dates. The date is parsed from the title attribute, or from
// the element content.
diff --git a/underlays/javascript/ikiwiki/toggle.js b/underlays/javascript/ikiwiki/toggle.js
index d190b737a..597a37458 100644
--- a/underlays/javascript/ikiwiki/toggle.js
+++ b/underlays/javascript/ikiwiki/toggle.js
@@ -1,3 +1,7 @@
+// © 2006-2010 Joey Hess
+// Redistribution and use in source and compiled forms, with or without
+// modification, are permitted under any circumstances. No warranty.
+//
// Uses CSS to hide toggleables, to avoid any flashing on page load. The
// CSS is only emitted after it tests that it's going to be able
// to show the toggleables.