diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 7f006af83..7e615f7f1 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -37,9 +37,9 @@ sub include_javascript ($;$) {
my $page=shift;
my $absolute=shift;
- return ''."\n".
- '';
}
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index f9c899540..3319421d9 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -81,9 +81,9 @@ sub include_javascript ($;$) {
my $page=shift;
my $absolute=shift;
- return ''."\n".
- '';
}
diff --git a/debian/changelog b/debian/changelog
index 425e28fa6..53febb433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100422) UNRELEASED; urgency=low
+ikiwiki (3.20100424) UNRELEASED; urgency=low
[ Joey Hess ]
* tag: Automatic creation of tag pages can now be enabled using
@@ -71,6 +71,9 @@ ikiwiki (3.20100422) UNRELEASED; urgency=low
(Jelmer Vernooij)
* Quite a lot of new optimisations, and one major fix to a recent
performance regression.
+ * Moved javascript files under the ikiwiki/ directory, to avoid cluttering
+ the top of the web root. This is another things that requires a wiki
+ rebuild on upgrade to this version.
-- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400
diff --git a/debian/postinst b/debian/postinst
index 810b7cfe0..76ad115ac 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
# Change this when some incompatible change is made that requires
# rebuilding all wikis.
-firstcompat=3.20100422
+firstcompat=3.20100424
if [ "$1" = configure ] && \
dpkg --compare-versions "$2" lt "$firstcompat"; then
diff --git a/underlays/javascript/ikiwiki.js b/underlays/javascript/ikiwiki/ikiwiki.js
similarity index 100%
rename from underlays/javascript/ikiwiki.js
rename to underlays/javascript/ikiwiki/ikiwiki.js
diff --git a/underlays/javascript/relativedate.js b/underlays/javascript/ikiwiki/relativedate.js
similarity index 100%
rename from underlays/javascript/relativedate.js
rename to underlays/javascript/ikiwiki/relativedate.js
diff --git a/underlays/javascript/toggle.js b/underlays/javascript/ikiwiki/toggle.js
similarity index 100%
rename from underlays/javascript/toggle.js
rename to underlays/javascript/ikiwiki/toggle.js