summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-11-28 18:16:04 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-11-28 18:16:04 +0000
commit951522ebc3fdd129f8f696fe1104546845ead4cb (patch)
tree30fdddc561950aaef8ce5bde585a81a54e6225e0
parentabd262cf58315ddcd8bc3d3d835d6eb1e107651e (diff)
* More build deps updates.
* /dev/null fortune failures * Add libtime-duration-perl to build deps, as it's used by the svn module
-rw-r--r--IkiWiki/Plugin/fortune.pm2
-rw-r--r--IkiWiki/Rcs/svn.pm1
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
4 files changed, 7 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm
index 43f4526af..4ff343e3a 100644
--- a/IkiWiki/Plugin/fortune.pm
+++ b/IkiWiki/Plugin/fortune.pm
@@ -12,7 +12,7 @@ sub import { #{{{
sub preprocess (@) { #{{{
$ENV{PATH}="$ENV{PATH}:/usr/games:/usr/local/games";
- my $f = `fortune`;
+ my $f = `fortune 2>/dev/null`;
if ($?) {
return "[[fortune failed]]";
diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 597295d44..848dfac3a 100644
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -131,7 +131,6 @@ sub rcs_recentchanges ($) { #{{{
eval q{
use Date::Parse;
- use Time::Duration;
use XML::SAX;
use XML::Simple;
};
diff --git a/debian/changelog b/debian/changelog
index 5f3b4c323..bde526b2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,17 @@
-ikiwiki (1.34.2) UNRELEASED; urgency=low
+ikiwiki (1.34.2) unstable; urgency=low
* Allow /etc/ikiwiki/wikilist to list just the names of users, if so then
~user/.ikiwiki/wikilist will be read.
* Fix url absolution code in inline plugin to support class and id fields in
links and imgs, and to support anchor urls.
+ * More build deps updates.
+ * /dev/null fortune failures
- -- Joey Hess <joeyh@debian.org> Tue, 28 Nov 2006 04:04:39 -0500
+ -- Joey Hess <joeyh@debian.org> Tue, 28 Nov 2006 12:58:47 -0500
ikiwiki (1.34.1) unstable; urgency=low
- * Add libtime-duraiton-perl to build deps, as it's used by the svn module
+ * Add libtime-duration-perl to build deps, as it's used by the svn module
which is now tested at build.
-- Joey Hess <joeyh@debian.org> Mon, 27 Nov 2006 12:26:12 -0500
diff --git a/debian/control b/debian/control
index 7b0fc3d5e..279f93199 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ikiwiki
Section: web
Priority: optional
Build-Depends: perl, debhelper (>= 5)
-Build-Depends-Indep: dpkg-dev (>= 1.9.0), markdown, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick, libtime-duration-perl
+Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick
Maintainer: Joey Hess <joeyh@debian.org>
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.kitenet.net/ikiwiki/trunk