Merge branch 'master' into templatemove

master
Joey Hess 2010-04-24 00:55:09 -04:00
commit 998f47ed13
7 changed files with 9 additions and 6 deletions

View File

@ -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>';
}

View File

@ -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>';
}

5
debian/changelog vendored
View File

@ -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 <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400

2
debian/postinst vendored
View File

@ -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