urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Re-organise dependencies and recommends now that recommends are installed 

by default.
master
Joey Hess 2007-12-16 17:16:56 -05:00
parent 58f1ef0784
commit f40c6928f4
6 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/NEWS vendored
View File

@ -1,4 +1,4 @@
ikiwiki (2.16) UNRELEASED; urgency=low ikiwiki (2.16) unstable; urgency=low
Many of the pages in ikiwiki's basewiki have been moved and renamed in this Many of the pages in ikiwiki's basewiki have been moved and renamed in this
release, to avoid the basewiki including pages with names like "blog". release, to avoid the basewiki including pages with names like "blog".

6
debian/changelog vendored
View File

@ -1,4 +1,4 @@
ikiwiki (2.16) UNRELEASED; urgency=low ikiwiki (2.16) unstable; urgency=low
* Major basewiki reorganisation. Most pages moved into ikiwiki/ subdirectory * Major basewiki reorganisation. Most pages moved into ikiwiki/ subdirectory
to avoid polluting the main namespace, and some were further renamed. to avoid polluting the main namespace, and some were further renamed.
@ -56,8 +56,10 @@ ikiwiki (2.16) UNRELEASED; urgency=low
* brokenlinks: Don't list the same link multiple times. (%links might * brokenlinks: Don't list the same link multiple times. (%links might
contain multiple copies of the same link) contain multiple copies of the same link)
* git: Correct display of multiline commit messages in recentchanges. * git: Correct display of multiline commit messages in recentchanges.
* Re-organise dependencies and recommends now that recommends are installed
by default.
-- Joey Hess <joeyh@debian.org> Mon, 03 Dec 2007 14:47:36 -0500 -- Joey Hess <joeyh@debian.org> Sun, 16 Dec 2007 16:55:23 -0500
ikiwiki (2.15) unstable; urgency=low ikiwiki (2.15) unstable; urgency=low

6
debian/control vendored
View File

@ -12,9 +12,9 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki
Package: ikiwiki Package: ikiwiki
Architecture: all Architecture: all
Depends: ${perl:Depends}, libxml-simple-perl, markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, libcgi-formbuilder-perl (>= 3.05), libtime-duration-perl, libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, gcc | c-compiler, libc6-dev | libc-dev, libhtml-parser-perl, liburi-perl Depends: ${perl:Depends}, markdown, libhtml-template-perl, libhtml-parser-perl, liburi-perl
Recommends: subversion | git-core | tla | mercurial, hyperestraier, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core | tla | mercurial, 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
Suggests: viewvc | viewcvs, 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 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 Conflicts: ikiwiki-plugin-table
Replaces: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table
Provides: ikiwiki-plugin-table Provides: ikiwiki-plugin-table

19
doc/install.mdwn
View File

@ -7,17 +7,22 @@ Ikiwiki is a perl program, and needs a recent version of perl such as
Ikiwiki requires the [[cpan Text::Markdown]], [[cpan URI]], Ikiwiki requires the [[cpan Text::Markdown]], [[cpan URI]],
[[cpan HTML::Parser]], and [[cpan HTML::Template]] perl modules be [[cpan HTML::Parser]], and [[cpan HTML::Template]] perl modules be
installed, and also uses the following perl modules if available: installed.
[[cpan CGI::Session]], [[cpan CGI::FormBuilder]] (version 3.05 or newer),
[[cpan Mail::Sendmail]], [[cpan Time::Duration]], [[cpan TimeDate]], It also uses the following perl modules if available: [[cpan
[[cpan HTML::Scrubber]], [[cpan RPC::XML]], [[cpan XML::Simple]], CGI::Session]], [[cpan CGI::FormBuilder]] (version 3.05 or newer), [[cpan
[[cpan XML::Feed]], [[cpan File::MimeInfo]], [[cpan Locale::gettext]] Mail::Sendmail]], [[cpan Time::Duration]], [[cpan TimeDate]], [[cpan
(version 1.04 or newer). HTML::Scrubber]], [[cpan 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.
Various [[plugins]] use other libraries and utlities; see their individual Various [[plugins]] use other libraries and utlities; see their individual
documentation for details. documentation for details.
The Debian packages depend on an appropriate set of these modules. The Debian packages depend on and recommend an appropriate set of packages.
While Fedora 7 doesn't have an ikiwiki package, you can install needed While Fedora 7 doesn't have an ikiwiki package, you can install needed
perl modules using this command: perl modules using this command:

7
doc/todo/Debian_package_could_Recommend_gcc_+_libc6-dev__44___not_Depend.mdwn
View File

@ -1,4 +1,7 @@
IkiWiki doesn't actually need a C compiler etc. except for CGI (and other wrappers?). As it's perfectly possible to use IkiWiki without the CGI mode, would it be possible to make the Debian package Recommend gcc/libc6-dev/etc., rather than Depending on them? IkiWiki doesn't actually need a C compiler etc. except for CGI (and other
wrappers?). As it's perfectly possible to use IkiWiki without the CGI mode,
would it be possible to make the Debian package Recommend
gcc/libc6-dev/etc., rather than Depending on them?
> My approach with the dependencies of the package is to depend on > My approach with the dependencies of the package is to depend on
> everything that is needed to use ikiwiki for a fairly full-featured wiki (but > everything that is needed to use ikiwiki for a fairly full-featured wiki (but
@ -14,4 +17,6 @@ IkiWiki doesn't actually need a C compiler etc. except for CGI (and other wrappe
> installed by apt. That will be sorting itself out over the next month or > installed by apt. That will be sorting itself out over the next month or
> so. --[[Joey]] > so. --[[Joey]]
> [[done]]
[[wishlist]] [[wishlist]]

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-12-16 16:44-0500\n" "POT-Creation-Date: 2007-12-16 16:55-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"