Your message dated Sat, 24 Nov 2007 22:32:02 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#451019: fixed in ikiwiki 2.13
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: ikiwiki
Version: 2.9
Severity: wishlist
Tags: patch
http://cairographics.org is currently using a slightly patched version
of ikiwiki. This means that Carl has to re-apply his patches when an
ikiwiki update is installed on fd.org. I would like to submit the
changes that might be suitable for upstream.
Subject: [PATCH] Allow DATE as a template parameter (with format controlled by
dateformat setting)
---
IkiWiki.pm | 12 +++++++++++-
Plugin/inline.pm | 1 +
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 953ad5a..71f502f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -16,7 +16,7 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime
%pagecase
use Exporter q{import};
our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
bestlink htmllink readfile writefile pagetype srcfile pagename
- displaytime will_render gettext urlto targetpage
+ displaytime displaydate will_render gettext urlto targetpage
%config %links %renderedfiles %pagesources %destsources);
our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
our $version="2.00";my $installdir="/usr";
@@ -70,6 +70,7 @@ sub defaultconfig () { #{{{
plugin => [qw{mdwn inline htmlscrubber passwordauth openid signinedit
lockedit conditional}],
timeformat => '%c',
+ dateformat => '%x',
locale => undef,
sslcookie => 0,
httpauth => 0,
@@ -446,6 +447,15 @@ sub displaytime ($) { #{{{
$config{timeformat}, localtime($time)));
} #}}}
+sub displaydate ($) { #{{{
+ my $time=shift;
+
+ # strftime doesn't know about encodings, so make sure
+ # its output is properly treated as utf8
+ return decode_utf8(POSIX::strftime(
+ $config{dateformat}, localtime($time)));
+} #}}}
+
sub beautify_url ($) { #{{{
my $url=shift;
diff --git a/Plugin/inline.pm b/Plugin/inline.pm
index cdecf51..2389dc6 100644
--- a/Plugin/inline.pm
+++ b/Plugin/inline.pm
@@ -148,6 +148,7 @@ sub preprocess_inline (@) { #{{{
$template->param(pageurl =>
urlto(bestlink($params{page}, $page), $params{destpage}));
$template->param(title => pagetitle(basename($page)));
$template->param(ctime =>
displaytime($pagectime{$page}));
+ $template->param(date =>
displaydate($pagectime{$page}));
if ($actions) {
my $file = $pagesources{$page};
--- End Message ---
--- Begin Message ---
Source: ikiwiki
Source-Version: 2.13
We believe that the bug you reported is fixed in the latest version of
ikiwiki, which is due to be installed in the Debian FTP archive:
ikiwiki_2.13.dsc
to pool/main/i/ikiwiki/ikiwiki_2.13.dsc
ikiwiki_2.13.tar.gz
to pool/main/i/ikiwiki/ikiwiki_2.13.tar.gz
ikiwiki_2.13_all.deb
to pool/main/i/ikiwiki/ikiwiki_2.13_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Joey Hess <[EMAIL PROTECTED]> (supplier of updated ikiwiki package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sat, 24 Nov 2007 16:06:22 -0500
Source: ikiwiki
Binary: ikiwiki
Architecture: source all
Version: 2.13
Distribution: unstable
Urgency: low
Maintainer: Joey Hess <[EMAIL PROTECTED]>
Changed-By: Joey Hess <[EMAIL PROTECTED]>
Description:
ikiwiki - a wiki compiler
Closes: 451019 451469 451666 451728 451729
Changes:
ikiwiki (2.13) unstable; urgency=low
.
The ikiwiki zombie army release.
.
* Add liblwpx-paranoidagent-perl to recommends of Debian package,
this is needed to do OpenID really securely.
* ikiwiki.setup is licensed same as the basewiki, not GPLed.
* inline: Add timeformat parameter to control how the ctime of
inlined pages is displayed. Closes: #451019
* Add wrappergroup config option, which can be used to cause wrappers
to be created owned by some group other than the default. Useful
then there's a shared repository with access controlled by a group,
to let ikiwiki run setgid to that group.
* ikiwiki-mass-rebuild: Run build with the user in all their groups.
* Correct markdown in example index page in setup. Closes: #451469
* Better error message when a setup file has a syntax error.
Closes: #451666
* Fix mercurial historyurl in example setup file.
* More compact output for the brokenlinks plugin.
* Allow trailing slashes after page names in wikilinks.
* Don't consider links to anchors on the same page to be self links.
Patch by Daniel Burrows. Closes: #451729
* When usedirs is disabled, link direct to index.html files, not to
directories, to improve browsing of file:// urls.
Patch by Daniel Burrows. Closes: #451728
* Allow html5 video and audio tags and their attributes in the htmlscrubber.
* toc: Handle html elements embedded inside a header, rather than
stopping collecting the header text at the first element.
Files:
2cd7428c75b9df921d5bf2712627aaaf 865 web optional ikiwiki_2.13.dsc
f4f15988769dea94b76bc13f186a034c 586995 web optional ikiwiki_2.13.tar.gz
d83734e6c3d288ef73ebd89dd14fdaab 698652 web optional ikiwiki_2.13_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFHSKRW2tp5zXiKP0wRAnHsAJ419wD/bnpBYszm05kMCLX/7/Bj1gCeMSbr
ipAWgTiqnOCyBrKLEM6MnKw=
=CRca
-----END PGP SIGNATURE-----
--- End Message ---
