diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | doc/install.mdwn | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index d41bf0d7e..70935c1d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ ikiwiki (2.40) UNRELEASED; urgency=low * camelcase: Convert to use new linkify and scan hooks rather than the old hack. * Setting NOTAINT=1 had no effect when building ikiwiki itself, fix this. + * Depend on HTML::Scrubber, since the scrubber is enabled by default and + dies if its can't be loaded. -- Josh Triplett <josh@freedesktop.org> Sun, 10 Feb 2008 13:18:58 -0800 diff --git a/debian/control b/debian/control index 2702c2936..902d856e1 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki Package: ikiwiki Architecture: all -Depends: ${perl:Depends}, markdown, libhtml-template-perl, libhtml-parser-perl, liburi-perl -Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core | tla | bzr (>= 0.91) | mercurial | monotone, libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libhtml-scrubber-perl, libcgi-formbuilder-perl (>= 3.05), libtime-duration-perl, libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl +Depends: ${perl:Depends}, markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl +Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core | tla | bzr (>= 0.91) | mercurial | monotone, libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libtime-duration-perl, libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl Suggests: viewvc | gitweb | viewcvs, hyperestraier, librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table diff --git a/doc/install.mdwn b/doc/install.mdwn index 6fdc8bb9e..5e3720c5e 100644 --- a/doc/install.mdwn +++ b/doc/install.mdwn @@ -6,15 +6,14 @@ Ikiwiki is a perl program, and needs a recent version of perl such as 5.8.8. (5.8.0 has been reported not to work). Ikiwiki requires the [[cpan Text::Markdown]], [[cpan URI]], -[[cpan HTML::Parser]], and [[cpan HTML::Template]] perl modules be -installed. +[[cpan HTML::Parser]], [[cpan HTML::Template]], and [[cpan HTML::Scrubber]] +perl modules be installed. It also uses the following perl modules if available: [[cpan CGI::Session]], [[cpan CGI::FormBuilder]] (version 3.05 or newer), [[cpan Mail::Sendmail]], [[cpan Time::Duration]], [[cpan TimeDate]], [[cpan -HTML::Scrubber]], [[cpan RPC::XML]], [[cpan XML::Simple]], [[cpan -XML::Feed]], [[cpan File::MimeInfo]], [[cpan Locale::gettext]] (version -1.04 or newer). +RPC::XML]], [[cpan XML::Simple]], [[cpan XML::Feed]], [[cpan +File::MimeInfo]], [[cpan Locale::gettext]] (version 1.04 or newer). It's recommended you have a C compiler, as ikiwiki uses one to build wrappers. |