From e90d67d3c9a93862657563e17e24054087f205d1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:54:59 -0400
Subject: [PATCH] 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.

---
 IkiWiki/Plugin/relativedate.pm                     | 4 ++--
 IkiWiki/Plugin/toggle.pm                           | 4 ++--
 debian/changelog                                   | 5 ++++-
 debian/postinst                                    | 2 +-
 underlays/javascript/{ => ikiwiki}/ikiwiki.js      | 0
 underlays/javascript/{ => ikiwiki}/relativedate.js | 0
 underlays/javascript/{ => ikiwiki}/toggle.js       | 0
 7 files changed, 9 insertions(+), 6 deletions(-)
 rename underlays/javascript/{ => ikiwiki}/ikiwiki.js (100%)
 rename underlays/javascript/{ => ikiwiki}/relativedate.js (100%)
 rename underlays/javascript/{ => ikiwiki}/toggle.js (100%)

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 '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+	return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>'."\n".
-		'<script src="'.urlto("relativedate.js", $page, $absolute).
+		'<script src="'.urlto("ikiwiki/relativedate.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>';
 }
 
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 '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+	return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>'."\n".
-		'<script src="'.urlto("toggle.js", $page, $absolute).
+		'<script src="'.urlto("ikiwiki/toggle.js", $page, $absolute).
 		'" type="text/javascript" charset="utf-8"></script>';
 }
 
diff --git a/debian/changelog b/debian/changelog
index 0ab04f522..f9d012e42 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
@@ -66,6 +66,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 <joeyh@debian.org>  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